@ai-matrx/records 0.76.1 → 0.76.2

package/dist/react/index.js

@@ -43218,21 +43218,31 @@ function isPlainNewestFirst(key) {
   }
 }
 var REREAD_PAGES_MAX = 2;
-function placeUnseen(qc, portKey, alias, rows) {
+async function sourceKind(qc, port, portKey, alias) {
+  try {
+    const sources = await qc.ensureQueryData({ queryKey: dataKeys.sources(portKey), queryFn: async () => unwrap(await port.sources()) });
+    return sources.find((s) => s.alias === alias)?.kind ?? null;
+  } catch {
+    return null;
+  }
+}
+function rereadOrCount(qc, key, data, count) {
+  if (data.pages.length <= REREAD_PAGES_MAX) void qc.invalidateQueries({ queryKey: key, exact: true });
+  else qc.setQueryData(key, { ...data, newer: (data.newer ?? 0) + count });
+}
+function placeUnseen(qc, portKey, alias, rows, kind) {
   for (const [key, data] of qc.getQueriesData({ queryKey: dataKeys.rowsPrefix(portKey, alias) })) {
     if (!data || data.pages.length === 0) continue;
     const missing = rows.filter((row) => !data.pages.some((page2) => page2.rows.some((r) => r._id === row._id)));
     if (missing.length === 0) continue;
-    if (isPlainNewestFirst(key)) {
+    if (kind === "table" && isPlainNewestFirst(key)) {
       const [first, ...rest] = data.pages;
       qc.setQueryData(key, {
         ...data,
         pages: [{ ...first, rows: [...missing, ...first.rows], total: first.total === null ? null : first.total + missing.length }, ...rest]
       });
-    } else if (data.pages.length <= REREAD_PAGES_MAX) {
-      void qc.invalidateQueries({ queryKey: key, exact: true });
     } else {
-      qc.setQueryData(key, { ...data, newer: (data.newer ?? 0) + missing.length });
+      rereadOrCount(qc, key, data, missing.length);
     }
   }
 }
@@ -43247,25 +43257,35 @@ async function rereadIds(qc, port, portKey, alias, ids) {
       unseen.push(answer.data);
     }
   }
-  if (unseen.length > 0) placeUnseen(qc, portKey, alias, unseen);
+  if (unseen.length > 0) placeUnseen(qc, portKey, alias, unseen, await sourceKind(qc, port, portKey, alias));
+}
+function rereadUnknown(qc, portKey, alias) {
+  for (const [key, data] of qc.getQueriesData({ queryKey: dataKeys.rowsPrefix(portKey, alias) })) {
+    if (!data || data.pages.length === 0) {
+      void qc.invalidateQueries({ queryKey: key, exact: true });
+      continue;
+    }
+    if (data.pages.length <= REREAD_PAGES_MAX) void qc.invalidateQueries({ queryKey: key, exact: true });
+    else qc.setQueryData(key, { ...data, newer: Math.max(data.newer ?? 0, 1) });
+  }
+  void qc.invalidateQueries({ queryKey: [...dataKeys.alias(portKey, alias), "row"] });
 }
 function onBump(qc, port, portKey, alias, entry, event) {
   if (event.shape) {
     void qc.invalidateQueries({ queryKey: dataKeys.alias(portKey, alias) });
     return;
   }
-  if (event.ids === null) {
-    void qc.invalidateQueries({ queryKey: dataKeys.rowsPrefix(portKey, alias) });
-    for (const [key] of qc.getQueriesData({ queryKey: [...dataKeys.alias(portKey, alias), "row"] })) void qc.invalidateQueries({ queryKey: key });
-    return;
-  }
-  for (const id of event.ids) entry.pending.add(id);
+  if (event.ids === null) entry.unknown = true;
+  else for (const id of event.ids) entry.pending.add(id);
   if (entry.flush) return;
   entry.flush = setTimeout(() => {
     entry.flush = null;
     const ids = [...entry.pending];
+    const unknown = entry.unknown;
     entry.pending.clear();
-    if (ids.length > 0) void rereadIds(qc, port, portKey, alias, ids);
+    entry.unknown = false;
+    if (unknown) rereadUnknown(qc, portKey, alias);
+    else if (ids.length > 0) void rereadIds(qc, port, portKey, alias, ids);
   }, BUMP_BATCH_MS);
 }
 function acquireLive(qc, port, events, portKey, alias) {
@@ -43274,7 +43294,7 @@ function acquireLive(qc, port, events, portKey, alias) {
   let entry = home.get(key);
   if (!entry) {
     const made = { refs: 0, stop: () => {
-    }, timer: null, pending: /* @__PURE__ */ new Set(), flush: null };
+    }, timer: null, pending: /* @__PURE__ */ new Set(), unknown: false, flush: null };
     if (events) {
       made.stop = events.on(`rows:${alias}`, (event) => onBump(qc, port, portKey, alias, made, event));
     } else if (!warnedNotLive) {
@@ -43362,6 +43382,15 @@ function useDataRows(alias, query = {}, scope) {
   };
 }
 var tempCounter = 0;
+function drawPatch(before, patch) {
+  const drawn = { ...before, ...patch, _id: before._id, _version: before._version, _organization_id: before._organization_id };
+  if (patch._custom && typeof patch._custom === "object") {
+    drawn._custom = { ...before._custom ?? {}, ...patch._custom };
+  } else if (before._custom !== void 0) {
+    drawn._custom = before._custom;
+  }
+  return drawn;
+}
 function useDataMutations(alias, scope) {
   const qc = useRecordsQueryClient();
   const { port, portKey } = useDataPort(scope);
@@ -43401,7 +43430,7 @@ function useDataMutations(alias, scope) {
         await qc.cancelQueries({ queryKey: dataKeys.alias(portKey, alias) });
         const rowKey = dataKeys.row(portKey, alias, id);
         const rowBefore = qc.getQueryData(rowKey);
-        if (before) patchRow(qc, portKey, alias, { ...before, ...patch, _id: id, _version: before._version, _organization_id: before._organization_id }, { force: true });
+        if (before) patchRow(qc, portKey, alias, drawPatch(before, patch), { force: true });
         const answer = await port.update(alias, id, patch, baseVersion);
         if (answer.ok) {
           patchRow(qc, portKey, alias, answer.data, { force: true });