tinybase 5.0.0-beta.25 → 5.0.0-beta.27

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

@@ -134,7 +134,6 @@ const {
 } = React;
 const EMPTY_ARRAY = [];
 const DEFAULTS = [{}, [], [EMPTY_ARRAY, void 0, EMPTY_ARRAY], void 0, false, 0];
-const IS_EQUAL = (thing1, thing2) => thing1 === thing2;
 const IS_EQUALS = [
   objIsEqual,
   arrayIsEqual,
@@ -146,6 +145,7 @@ const IS_EQUALS = [
     arrayIsEqual(backwardIds1, backwardIds2) &&
     arrayIsEqual(forwardIds1, forwardIds2),
 ];
+const isEqual = (thing1, thing2) => thing1 === thing2;
 const useCreate = (store, create, createDeps = EMPTY_ARRAY) => {
   const [, rerender] = useState$2();
   const [thing, setThing] = useState$2();
@@ -165,33 +165,38 @@ const addAndDelListener = (thing, listenable, ...args) => {
   const listenerId = thing?.[ADD + listenable + LISTENER]?.(...args);
   return () => thing?.delListener(listenerId);
 };
-const useListenable = (listenable, thing, type, args = EMPTY_ARRAY) => {
-  const lastResult = useRef$1(DEFAULTS[type]);
+const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
+  const lastResult = useRef$1(DEFAULTS[returnType]);
   const getResult = useCallback$2(
     () => {
       const nextResult =
-        thing?.[(type == 4 ? _HAS : GET) + listenable]?.(...args) ??
-        DEFAULTS[type];
-      return !(IS_EQUALS[type] ?? IS_EQUAL)(nextResult, lastResult.current)
+        thing?.[(returnType == 4 /* Boolean */ ? _HAS : GET) + listenable]?.(
+          ...args,
+        ) ?? DEFAULTS[returnType];
+      return !(IS_EQUALS[returnType] ?? isEqual)(nextResult, lastResult.current)
         ? (lastResult.current = nextResult)
         : lastResult.current;
     },
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [thing, type, listenable, ...args],
+    [thing, returnType, listenable, ...args],
   );
   const subscribe = useCallback$2(
     (listener) =>
       addAndDelListener(
         thing,
-        (type == 4 ? HAS : EMPTY_STRING) + listenable,
+        (returnType == 4 /* Boolean */ ? HAS : EMPTY_STRING) + listenable,
         ...args,
         listener,
       ),
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [thing, type, listenable, ...args],
+    [thing, returnType, listenable, ...args],
   );
   const result = useSyncExternalStore(subscribe, getResult);
-  return type == 0 ? {...result} : type < 3 ? [...result] : result;
+  return returnType == 0 /* Object */
+    ? {...result}
+    : returnType < 3 /* CellOrValue */
+      ? [...result]
+      : result;
 };
 const useListener = (
   listenable,
@@ -266,28 +271,49 @@ const useCreateMergeableStore = (create, createDeps = EMPTY_ARRAY) =>
   useMemo$1(create, createDeps);
 const useStoreIds = () => useThingIds(1);
 const useHasTables = (storeOrStoreId) =>
-  useListenable(TABLES, useStoreOrStoreById(storeOrStoreId), 4, []);
+  useListenable(
+    TABLES,
+    useStoreOrStoreById(storeOrStoreId),
+    4 /* Boolean */,
+    [],
+  );
 const useTables = (storeOrStoreId) =>
-  useListenable(TABLES, useStoreOrStoreById(storeOrStoreId), 0);
+  useListenable(TABLES, useStoreOrStoreById(storeOrStoreId), 0 /* Object */);
 const useTableIds = (storeOrStoreId) =>
-  useListenable(TABLE_IDS, useStoreOrStoreById(storeOrStoreId), 1);
+  useListenable(TABLE_IDS, useStoreOrStoreById(storeOrStoreId), 1 /* Array */);
 const useHasTable = (tableId, storeOrStoreId) =>
-  useListenable(TABLE, useStoreOrStoreById(storeOrStoreId), 4, [tableId]);
-const useTable = (tableId, storeOrStoreId) =>
-  useListenable(TABLE, useStoreOrStoreById(storeOrStoreId), 0, [tableId]);
-const useTableCellIds = (tableId, storeOrStoreId) =>
-  useListenable(TABLE + CELL_IDS, useStoreOrStoreById(storeOrStoreId), 1, [
+  useListenable(TABLE, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
     tableId,
   ]);
-const useHasTableCell = (tableId, cellId, storeOrStoreId) =>
-  useListenable(TABLE + CELL, useStoreOrStoreById(storeOrStoreId), 4, [
+const useTable = (tableId, storeOrStoreId) =>
+  useListenable(TABLE, useStoreOrStoreById(storeOrStoreId), 0 /* Object */, [
     tableId,
-    cellId,
   ]);
+const useTableCellIds = (tableId, storeOrStoreId) =>
+  useListenable(
+    TABLE + CELL_IDS,
+    useStoreOrStoreById(storeOrStoreId),
+    1 /* Array */,
+    [tableId],
+  );
+const useHasTableCell = (tableId, cellId, storeOrStoreId) =>
+  useListenable(
+    TABLE + CELL,
+    useStoreOrStoreById(storeOrStoreId),
+    4 /* Boolean */,
+    [tableId, cellId],
+  );
 const useRowCount = (tableId, storeOrStoreId) =>
-  useListenable(ROW_COUNT, useStoreOrStoreById(storeOrStoreId), 5, [tableId]);
+  useListenable(
+    ROW_COUNT,
+    useStoreOrStoreById(storeOrStoreId),
+    5 /* Number */,
+    [tableId],
+  );
 const useRowIds = (tableId, storeOrStoreId) =>
-  useListenable(ROW_IDS, useStoreOrStoreById(storeOrStoreId), 1, [tableId]);
+  useListenable(ROW_IDS, useStoreOrStoreById(storeOrStoreId), 1 /* Array */, [
+    tableId,
+  ]);
 const useSortedRowIds = (
   tableId,
   cellId,
@@ -296,44 +322,62 @@ const useSortedRowIds = (
   limit,
   storeOrStoreId,
 ) =>
-  useListenable(SORTED_ROW_IDS, useStoreOrStoreById(storeOrStoreId), 1, [
+  useListenable(
+    SORTED_ROW_IDS,
+    useStoreOrStoreById(storeOrStoreId),
+    1 /* Array */,
+    [tableId, cellId, descending, offset, limit],
+  );
+const useHasRow = (tableId, rowId, storeOrStoreId) =>
+  useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
     tableId,
-    cellId,
-    descending,
-    offset,
-    limit,
+    rowId,
   ]);
-const useHasRow = (tableId, rowId, storeOrStoreId) =>
-  useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 4, [tableId, rowId]);
 const useRow = (tableId, rowId, storeOrStoreId) =>
-  useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 0, [tableId, rowId]);
-const useCellIds = (tableId, rowId, storeOrStoreId) =>
-  useListenable(CELL_IDS, useStoreOrStoreById(storeOrStoreId), 1, [
+  useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 0 /* Object */, [
     tableId,
     rowId,
   ]);
-const useHasCell = (tableId, rowId, cellId, storeOrStoreId) =>
-  useListenable(CELL, useStoreOrStoreById(storeOrStoreId), 4, [
+const useCellIds = (tableId, rowId, storeOrStoreId) =>
+  useListenable(CELL_IDS, useStoreOrStoreById(storeOrStoreId), 1 /* Array */, [
     tableId,
     rowId,
-    cellId,
   ]);
-const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
-  useListenable(CELL, useStoreOrStoreById(storeOrStoreId), 3, [
+const useHasCell = (tableId, rowId, cellId, storeOrStoreId) =>
+  useListenable(CELL, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
     tableId,
     rowId,
     cellId,
   ]);
+const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
+  useListenable(
+    CELL,
+    useStoreOrStoreById(storeOrStoreId),
+    3 /* CellOrValue */,
+    [tableId, rowId, cellId],
+  );
 const useHasValues = (storeOrStoreId) =>
-  useListenable(VALUES, useStoreOrStoreById(storeOrStoreId), 4, []);
+  useListenable(
+    VALUES,
+    useStoreOrStoreById(storeOrStoreId),
+    4 /* Boolean */,
+    [],
+  );
 const useValues = (storeOrStoreId) =>
-  useListenable(VALUES, useStoreOrStoreById(storeOrStoreId), 0);
+  useListenable(VALUES, useStoreOrStoreById(storeOrStoreId), 0 /* Object */);
 const useValueIds = (storeOrStoreId) =>
-  useListenable(VALUE_IDS, useStoreOrStoreById(storeOrStoreId), 1);
+  useListenable(VALUE_IDS, useStoreOrStoreById(storeOrStoreId), 1 /* Array */);
 const useHasValue = (valueId, storeOrStoreId) =>
-  useListenable(VALUE, useStoreOrStoreById(storeOrStoreId), 4, [valueId]);
+  useListenable(VALUE, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
+    valueId,
+  ]);
 const useValue = (valueId, storeOrStoreId) =>
-  useListenable(VALUE, useStoreOrStoreById(storeOrStoreId), 3, [valueId]);
+  useListenable(
+    VALUE,
+    useStoreOrStoreById(storeOrStoreId),
+    3 /* CellOrValue */,
+    [valueId],
+  );
 const useSetTablesCallback = (
   getTables,
   getTablesDeps,
@@ -849,11 +893,18 @@ const useCreateMetrics = (store, create, createDeps) =>
   useCreate(store, create, createDeps);
 const useMetricsIds = () => useThingIds(3);
 const useMetricIds = (metricsOrMetricsId) =>
-  useListenable('MetricIds', useMetricsOrMetricsById(metricsOrMetricsId), 1);
+  useListenable(
+    'MetricIds',
+    useMetricsOrMetricsById(metricsOrMetricsId),
+    1 /* Array */,
+  );
 const useMetric = (metricId, metricsOrMetricsId) =>
-  useListenable('Metric', useMetricsOrMetricsById(metricsOrMetricsId), 3, [
-    metricId,
-  ]);
+  useListenable(
+    'Metric',
+    useMetricsOrMetricsById(metricsOrMetricsId),
+    3 /* CellOrValue */,
+    [metricId],
+  );
 const useMetricListener = (
   metricId,
   listener,
@@ -871,16 +922,23 @@ const useCreateIndexes = (store, create, createDeps) =>
   useCreate(store, create, createDeps);
 const useIndexesIds = () => useThingIds(5);
 const useSliceIds = (indexId, indexesOrIndexesId) =>
-  useListenable('SliceIds', useIndexesOrIndexesById(indexesOrIndexesId), 1, [
-    indexId,
-  ]);
+  useListenable(
+    'SliceIds',
+    useIndexesOrIndexesById(indexesOrIndexesId),
+    1 /* Array */,
+    [indexId],
+  );
 const useIndexIds = (indexesOrIndexesId) =>
-  useListenable('IndexIds', useIndexesOrIndexesById(indexesOrIndexesId), 1);
+  useListenable(
+    'IndexIds',
+    useIndexesOrIndexesById(indexesOrIndexesId),
+    1 /* Array */,
+  );
 const useSliceRowIds = (indexId, sliceId, indexesOrIndexesId) =>
   useListenable(
     'Slice' + ROW_IDS,
     useIndexesOrIndexesById(indexesOrIndexesId),
-    1,
+    1 /* Array */,
     [indexId, sliceId],
   );
 const useSliceIdsListener = (
@@ -917,7 +975,7 @@ const useRelationshipIds = (relationshipsOrRelationshipsId) =>
   useListenable(
     'RelationshipIds',
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    1,
+    1 /* Array */,
   );
 const useRemoteRowId = (
   relationshipId,
@@ -927,7 +985,7 @@ const useRemoteRowId = (
   useListenable(
     'RemoteRowId',
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    3,
+    3 /* CellOrValue */,
     [relationshipId, localRowId],
   );
 const useLocalRowIds = (
@@ -938,7 +996,7 @@ const useLocalRowIds = (
   useListenable(
     'Local' + ROW_IDS,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    1,
+    1 /* Array */,
     [relationshipId, remoteRowId],
   );
 const useLinkedRowIds = (
@@ -949,7 +1007,7 @@ const useLinkedRowIds = (
   useListenable(
     'Linked' + ROW_IDS,
     useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
-    1,
+    1 /* Array */,
     [relationshipId, firstRowId],
   );
 const useRemoteRowIdListener = (
@@ -998,33 +1056,37 @@ const useCreateQueries = (store, create, createDeps) =>
   useCreate(store, create, createDeps);
 const useQueriesIds = () => useThingIds(9);
 const useQueryIds = (queriesOrQueriesId) =>
-  useListenable('QueryIds', useQueriesOrQueriesById(queriesOrQueriesId), 1);
+  useListenable(
+    'QueryIds',
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    1 /* Array */,
+  );
 const useResultTable = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + TABLE,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    0,
+    0 /* Object */,
     [queryId],
   );
 const useResultTableCellIds = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + TABLE + CELL_IDS,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    1,
+    1 /* Array */,
     [queryId],
   );
 const useResultRowCount = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_COUNT,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    5,
+    5 /* Number */,
     [queryId],
   );
 const useResultRowIds = (queryId, queriesOrQueriesId) =>
   useListenable(
     RESULT + ROW_IDS,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    1,
+    1 /* Array */,
     [queryId],
   );
 const useResultSortedRowIds = (
@@ -1038,27 +1100,30 @@ const useResultSortedRowIds = (
   useListenable(
     RESULT + SORTED_ROW_IDS,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    1,
+    1 /* Array */,
     [queryId, cellId, descending, offset, limit],
   );
 const useResultRow = (queryId, rowId, queriesOrQueriesId) =>
-  useListenable(RESULT + ROW, useQueriesOrQueriesById(queriesOrQueriesId), 0, [
-    queryId,
-    rowId,
-  ]);
+  useListenable(
+    RESULT + ROW,
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    0 /* Object */,
+    [queryId, rowId],
+  );
 const useResultCellIds = (queryId, rowId, queriesOrQueriesId) =>
   useListenable(
     RESULT + CELL_IDS,
     useQueriesOrQueriesById(queriesOrQueriesId),
-    1,
+    1 /* Array */,
     [queryId, rowId],
   );
 const useResultCell = (queryId, rowId, cellId, queriesOrQueriesId) =>
-  useListenable(RESULT + CELL, useQueriesOrQueriesById(queriesOrQueriesId), 3, [
-    queryId,
-    rowId,
-    cellId,
-  ]);
+  useListenable(
+    RESULT + CELL,
+    useQueriesOrQueriesById(queriesOrQueriesId),
+    3 /* CellOrValue */,
+    [queryId, rowId, cellId],
+  );
 const useResultTableListener = (
   queryId,
   listener,
@@ -1178,13 +1243,13 @@ const useCheckpointIds = (checkpointsOrCheckpointsId) =>
   useListenable(
     'CheckpointIds',
     useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
-    2,
+    2 /* Checkpoints */,
   );
 const useCheckpoint = (checkpointId, checkpointsOrCheckpointsId) =>
   useListenable(
     'Checkpoint',
     useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
-    3,
+    3 /* CellOrValue */,
     [checkpointId],
   );
 const useSetCheckpointCallback = (

package/ui-react-inspector/index.js

@@ -1602,10 +1602,15 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
+const Persists = {
+  StoreOnly: 1,
+  MergeableStoreOnly: 2,
+  StoreOrMergeableStore: 3,
+};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1614,7 +1619,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1631,7 +1636,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1649,7 +1654,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1805,7 +1810,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

package/ui-react-inspector/with-schemas/index.js

@@ -1602,10 +1602,15 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
+const Persists = {
+  StoreOnly: 1,
+  MergeableStoreOnly: 2,
+  StoreOrMergeableStore: 3,
+};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1614,7 +1619,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1631,7 +1636,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1649,7 +1654,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -1805,7 +1810,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };