tsdf 17.0.0-alpha.16 → 17.0.0-alpha.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/main.js CHANGED
@@ -1,5 +1,5 @@
1
- import { A as offlineResolutionRecordSchema, C as OfflineResolutionConflictParseError, D as isModeEffectivelyActive, E as getIsOfflineModeFromStatus, F as warnIfNavigatorLockUnavailable, G as parsePersistedAsyncNamespaceKind, I as createCompactLocalStorageEntry, K as serializeProtectedRef, L as parseCompactLocalStorageEntry, M as getSessionProtectedKeysSnapshot, N as setSessionProtectedKeysSnapshot, O as isOfflineModeStatusValue, P as getNavigatorLockManager, S as serializeJsonForStorage, T as defaultOfflineRuntimeConfig, V as getPayloadRecordKey, _ as getDefaultMaxBytesForScope, a as estimateManagedAsyncStorageEntrySizeBytes, b as getSerializedStringSize, c as readAsyncStorageNamespaceIndexStateUsingDriver, d as unregisterAsyncStartupStoreCleanup, f as parseAsyncStorageNamespaceKind, g as resolveTSDFLogger, h as getTSDFDebugTimingMs, j as clearSessionProtectedKeysSnapshot, k as offlineItemEntityRefSchema, l as registerAsyncStartupStoreCleanup, m as emitTSDFDebugLog, o as getProtectedKeysFromMetadata, p as logPersistentStorageQuotaCleanup, q as scheduleIdleCleanup, r as buildPersistedStaticPolicy, s as mergeManagedAsyncStorageCustomMetadata, u as serializeProtectedRef$1, v as createShouldIgnoreItemPredicate, w as compactOfflineStatusSnapshotSchema, x as keepEntriesWithinByteBudget, y as createTimedKeySet } from "./asyncStorageAdapter-B-pdNeAs.js";
2
- import { a as encodePathSegment, i as getNavigatorStorageDirectory, n as getDirectoryHandleIfExists, r as getFileHandleIfExists } from "./opfsPersistentStorage-DobQJr0X.js";
1
+ import { A as offlineResolutionRecordSchema, C as OfflineResolutionConflictParseError, D as isModeEffectivelyActive, E as getIsOfflineModeFromStatus, F as warnIfNavigatorLockUnavailable, G as parsePersistedAsyncNamespaceKind, I as createCompactLocalStorageEntry, J as scheduleIdleCleanup, K as serializeProtectedRef, L as parseCompactLocalStorageEntry, M as getSessionProtectedKeysSnapshot, N as setSessionProtectedKeysSnapshot, O as isOfflineModeStatusValue, P as getNavigatorLockManager, S as serializeJsonForStorage, T as defaultOfflineRuntimeConfig, V as getPayloadRecordKey, _ as getDefaultMaxBytesForScope, a as estimateManagedAsyncStorageEntrySizeBytes, b as getSerializedStringSize, c as readAsyncStorageNamespaceIndexStateUsingDriver, d as unregisterAsyncStartupStoreCleanup, f as parseAsyncStorageNamespaceKind, g as resolveTSDFLogger, h as getTSDFDebugTimingMs, j as clearSessionProtectedKeysSnapshot, k as offlineItemEntityRefSchema, l as registerAsyncStartupStoreCleanup, m as emitTSDFDebugLog, o as getProtectedKeysFromMetadata, p as logPersistentStorageQuotaCleanup, q as INITIAL_MAINTENANCE_CLEANUP_DELAY_MS, r as buildPersistedStaticPolicy, s as mergeManagedAsyncStorageCustomMetadata, u as serializeProtectedRef$1, v as createShouldIgnoreItemPredicate, w as compactOfflineStatusSnapshotSchema, x as keepEntriesWithinByteBudget, y as createTimedKeySet } from "./asyncStorageAdapter-CGfnsd9m.js";
2
+ import { a as encodePathSegment, i as getNavigatorStorageDirectory, n as getDirectoryHandleIfExists, r as getFileHandleIfExists } from "./opfsPersistentStorage-DqJXzF7M.js";
3
3
  import { isWindowFocused, onWindowFocus } from "@ls-stack/browser-utils/window";
4
4
  import { filterAndMap, findAndMap, sortBy } from "@ls-stack/utils/arrayUtils";
5
5
  import { getCompositeKey } from "@ls-stack/utils/getCompositeKey";
@@ -866,7 +866,7 @@ const persistedCollectionItemDataSchema = rc_object({
866
866
  const persistedListQueryItemDataSchema = rc_object({
867
867
  data: rc_unknown,
868
868
  payload: rc_unknown,
869
- loadedFields: rc_array(rc_string).optional()
869
+ loadedFields: rc_union(rc_array(rc_string), rc_literals("*")).optional()
870
870
  });
871
871
  const persistedListQueryDataSchema = rc_object({
872
872
  payload: rc_unknown,
@@ -1257,7 +1257,9 @@ function scheduleAdapterExpirationScan(adapter) {
1257
1257
  if (adapter === "local-sync") {
1258
1258
  if (localStorageExpirationScanScheduled) return;
1259
1259
  localStorageExpirationScanScheduled = true;
1260
- scheduleLocalStorageMaintenance();
1260
+ setTimeout(() => {
1261
+ scheduleLocalStorageMaintenance();
1262
+ }, INITIAL_MAINTENANCE_CLEANUP_DELAY_MS);
1261
1263
  return;
1262
1264
  }
1263
1265
  if (scannedAsyncAdapters.has(adapter)) return;
@@ -2174,7 +2176,7 @@ async function clearSessionStorage(sessionKey, adapter) {
2174
2176
  }
2175
2177
  /** Clears all persistent storage entries for a given session key across built-in adapters. */
2176
2178
  async function clearAllSessionStorage(sessionKey) {
2177
- const { indexedDbPersistentStorage, opfsPersistentStorage } = await import("./asyncStorageAdapters-0ObaLfne.js");
2179
+ const { indexedDbPersistentStorage, opfsPersistentStorage } = await import("./asyncStorageAdapters-BpfM2_Y6.js");
2178
2180
  await Promise.all([
2179
2181
  clearSessionStorage(sessionKey, "local-sync"),
2180
2182
  clearSessionStorage(sessionKey, opfsPersistentStorage),
@@ -10192,7 +10194,7 @@ function toItemState(persisted, dataSchema, shouldIgnoreItem) {
10192
10194
  const validated = parsePersistedStoreData(persisted.data, dataSchema);
10193
10195
  if (validated === null) return null;
10194
10196
  if (shouldIgnoreItem(persisted.payload)) return null;
10195
- const loadedFields = Array.isArray(persisted.loadedFields) ? Array.from(new Set(persisted.loadedFields)).sort() : Object.keys(validated).sort();
10197
+ const loadedFields = persisted.loadedFields === "*" ? "*" : Array.isArray(persisted.loadedFields) ? Array.from(new Set(persisted.loadedFields)).sort() : void 0;
10196
10198
  return {
10197
10199
  item: validated,
10198
10200
  itemQuery: {
@@ -10247,7 +10249,7 @@ function setupListQueryPersistence(config, options = {}) {
10247
10249
  deserialize: (value, metadata) => typeof value === "object" && value !== null && "d" in value && ("p" in value || metadata?.p !== void 0) ? parsePersistedListQueryItemData({
10248
10250
  data: value.d,
10249
10251
  payload: "p" in value ? value.p : metadata?.p,
10250
- ..."lf" in value && Array.isArray(value.lf) ? { loadedFields: value.lf } : {}
10252
+ ..."lf" in value && (Array.isArray(value.lf) || value.lf === "*") ? { loadedFields: value.lf } : {}
10251
10253
  }, config.itemPayloadSchema, dataSchema) : null
10252
10254
  };
10253
10255
  const asyncItemStorageValueCodec = {
@@ -10255,7 +10257,7 @@ function setupListQueryPersistence(config, options = {}) {
10255
10257
  deserialize: (value, metadata) => metadata?.p !== void 0 ? parsePersistedListQueryItemData({
10256
10258
  data: value,
10257
10259
  payload: metadata.p,
10258
- ...Array.isArray(metadata.f) ? { loadedFields: metadata.f } : {}
10260
+ ...metadata.f !== void 0 ? { loadedFields: metadata.f } : {}
10259
10261
  }, config.itemPayloadSchema, dataSchema) : null
10260
10262
  };
10261
10263
  const queryStorageValueCodec = {
@@ -10283,7 +10285,7 @@ function setupListQueryPersistence(config, options = {}) {
10283
10285
  }, {
10284
10286
  asyncValueCodec: asyncItemStorageValueCodec,
10285
10287
  getManifestMeta: (data) => ({
10286
- ...Array.isArray(data.loadedFields) ? { f: data.loadedFields } : {},
10288
+ ...data.loadedFields !== void 0 ? { f: data.loadedFields } : {},
10287
10289
  p: data.payload
10288
10290
  }),
10289
10291
  valueCodec: itemStorageValueCodec
@@ -10388,6 +10390,8 @@ function setupListQueryPersistence(config, options = {}) {
10388
10390
  const querySizeBytesByKey = /* @__PURE__ */ new Map();
10389
10391
  const hydratedPersistedItemKeys = /* @__PURE__ */ new Set();
10390
10392
  const hydratedPersistedQueryKeys = /* @__PURE__ */ new Set();
10393
+ const budgetEvictedItemRecency = /* @__PURE__ */ new Map();
10394
+ const budgetEvictedQueryRecency = /* @__PURE__ */ new Map();
10391
10395
  const syncHydrationItemMissCache = createTimedKeySet();
10392
10396
  const syncHydrationQueryMissCache = createTimedKeySet();
10393
10397
  let knownPersistedItemKeys = null;
@@ -10705,13 +10709,42 @@ function setupListQueryPersistence(config, options = {}) {
10705
10709
  querySizeBytesByKey.delete(queryKey);
10706
10710
  knownPersistedQueryKeys?.delete(queryKey);
10707
10711
  }
10712
+ /**
10713
+ * Resolves the recency an in-state entry without persisted metadata should
10714
+ * compete with in the byte budget. Previously budget-evicted entries keep
10715
+ * their remembered (stale) recency while their content is unchanged, so they
10716
+ * deterministically lose again instead of churning back into storage; a
10717
+ * changed snapshot means the entry was genuinely refetched and counts as
10718
+ * freshly accessed.
10719
+ */
10720
+ function getBudgetEvictedLastAccessAt(memory, key, value, fallback) {
10721
+ const remembered = memory.get(key);
10722
+ if (remembered === void 0) return fallback;
10723
+ if (remembered.snapshot !== JSON.stringify(value)) {
10724
+ memory.delete(key);
10725
+ return fallback;
10726
+ }
10727
+ return remembered.lastAccessAt;
10728
+ }
10729
+ /**
10730
+ * Remembers an entry evicted by the byte budget while it is still in state,
10731
+ * so later flushes don't re-persist it as if it were freshly accessed (see
10732
+ * budgetEvictedQueryRecency / budgetEvictedItemRecency).
10733
+ */
10734
+ function rememberBudgetEvictedEntry(memory, key, lastAccessAt, snapshot, isInState) {
10735
+ if (!isInState || snapshot === void 0) return;
10736
+ memory.set(key, {
10737
+ lastAccessAt,
10738
+ snapshot
10739
+ });
10740
+ }
10708
10741
  function materializeHydratedItemState(itemKey, itemState) {
10709
10742
  if (!storeRef) return;
10710
10743
  suppressedPersistedStateFlushes++;
10711
10744
  storeRef.produceState((draft) => {
10712
10745
  draft.items[itemKey] = itemState.item;
10713
10746
  draft.itemQueries[itemKey] = itemState.itemQuery;
10714
- draft.itemLoadedFields[itemKey] = itemState.loadedFields;
10747
+ if (itemState.loadedFields !== void 0) draft.itemLoadedFields[itemKey] = itemState.loadedFields;
10715
10748
  });
10716
10749
  }
10717
10750
  function materializeHydratedQueryState(queryKey, query) {
@@ -10928,8 +10961,7 @@ function setupListQueryPersistence(config, options = {}) {
10928
10961
  if (!storeRef) return false;
10929
10962
  const existingItemQuery = storeRef.state.itemQueries[itemKey];
10930
10963
  const existingItem = storeRef.state.items[itemKey];
10931
- const existingLoadedFields = storeRef.state.itemLoadedFields[itemKey];
10932
- if (existingItemQuery !== void 0 && existingItem !== void 0 && existingLoadedFields !== void 0) return existingItemQuery !== null;
10964
+ if (existingItemQuery !== void 0 && existingItem !== void 0) return existingItemQuery !== null;
10933
10965
  if (existingItemQuery === null) return false;
10934
10966
  if (localStorageAdapter !== null) {
10935
10967
  const itemState = readHydratedItem(itemKey);
@@ -10954,8 +10986,7 @@ function setupListQueryPersistence(config, options = {}) {
10954
10986
  for (const itemKey of [...new Set(itemKeys)]) {
10955
10987
  const existingItemQuery = storeRef.state.itemQueries[itemKey];
10956
10988
  const existingItem = storeRef.state.items[itemKey];
10957
- const existingLoadedFields = storeRef.state.itemLoadedFields[itemKey];
10958
- if (existingItemQuery !== void 0 && existingItem !== void 0 && existingLoadedFields !== void 0) {
10989
+ if (existingItemQuery !== void 0 && existingItem !== void 0) {
10959
10990
  resultsByKey.set(itemKey, Promise.resolve(existingItemQuery !== null));
10960
10991
  continue;
10961
10992
  }
@@ -11126,7 +11157,10 @@ function setupListQueryPersistence(config, options = {}) {
11126
11157
  const { keptKeys: keptQueryKeys, unprotectedBytes } = keepEntriesWithinByteBudget(filteredEntries, (entry) => entry.queryKey, (entry) => entry.lastAccessAt, (entry) => entry.sizeBytes, (entry) => pinnedQueryKeys.has(entry.queryKey), (entry) => entry.offlineProtected, maxQueryBytes);
11127
11158
  logQueryByteBudgetCleanup("maintenance", filteredEntries.length, keptQueryKeys, unprotectedBytes);
11128
11159
  await Promise.all(filteredEntries.filter(({ queryKey }) => !keptQueryKeys.has(queryKey)).map(({ queryKey }) => removeLocalStorageQueryEntry(queryKey)));
11129
- for (const { queryKey } of filteredEntries) if (!keptQueryKeys.has(queryKey)) forgetPersistedQuery(queryKey);
11160
+ for (const { queryKey, lastAccessAt } of filteredEntries) if (!keptQueryKeys.has(queryKey)) {
11161
+ rememberBudgetEvictedEntry(budgetEvictedQueryRecency, queryKey, lastAccessAt, querySnapshotByKey.get(queryKey), storeRef !== null && Object.hasOwn(storeRef.state.queries, queryKey));
11162
+ forgetPersistedQuery(queryKey);
11163
+ }
11130
11164
  knownPersistedQueryKeys = keptQueryKeys;
11131
11165
  return {
11132
11166
  keptQueryKeys,
@@ -11153,7 +11187,10 @@ function setupListQueryPersistence(config, options = {}) {
11153
11187
  await Promise.all(validEntries.filter(({ queryKey }) => !keptQueryKeys.has(queryKey)).map(({ queryKey }) => queryNamespace.remove(queryKey)));
11154
11188
  for (const entry of validEntries) {
11155
11189
  const { queryKey } = entry;
11156
- if (!keptQueryKeys.has(queryKey)) forgetPersistedQuery(queryKey);
11190
+ if (!keptQueryKeys.has(queryKey)) {
11191
+ rememberBudgetEvictedEntry(budgetEvictedQueryRecency, queryKey, entry.lastAccessAt, querySnapshotByKey.get(queryKey), storeRef !== null && Object.hasOwn(storeRef.state.queries, queryKey));
11192
+ forgetPersistedQuery(queryKey);
11193
+ }
11157
11194
  }
11158
11195
  knownPersistedQueryKeys = keptQueryKeys;
11159
11196
  return {
@@ -11195,7 +11232,10 @@ function setupListQueryPersistence(config, options = {}) {
11195
11232
  evictedItemKeys.add(itemKey);
11196
11233
  return itemNamespace.remove(itemKey);
11197
11234
  }));
11198
- for (const { itemKey } of persistedItemEntries) if (!keptItemKeys.has(itemKey)) forgetPersistedItem(itemKey);
11235
+ for (const { itemKey, lastAccessAt } of persistedItemEntries) if (!keptItemKeys.has(itemKey)) {
11236
+ rememberBudgetEvictedEntry(budgetEvictedItemRecency, itemKey, lastAccessAt, itemSnapshotByKey.get(itemKey), storeRef !== null && storeRef.state.items[itemKey] != null);
11237
+ forgetPersistedItem(itemKey);
11238
+ }
11199
11239
  knownPersistedItemKeys = keptItemKeys;
11200
11240
  if (evictedItemKeys.size === 0 || keptQueryKeys.size === 0) return;
11201
11241
  const queryEntries = managedQueryEntriesByKey ? [...managedQueryEntriesByKey.values()].filter(({ queryKey }) => keptQueryKeys.has(queryKey)) : filterAndMap([...keptQueryKeys], (queryKey) => {
@@ -11242,7 +11282,10 @@ function setupListQueryPersistence(config, options = {}) {
11242
11282
  const { keptKeys: keptItemKeys, unprotectedBytes } = keepEntriesWithinByteBudget(persistedItemEntries, (entry) => entry.itemKey, (entry) => entry.lastAccessAt, (entry) => entry.sizeBytes, (entry) => pinnedItemKeys.has(entry.itemKey), (entry) => protectedItemKeys.has(entry.itemKey), maxItemBytes);
11243
11283
  logItemByteBudgetCleanup("maintenance", persistedItemEntries.length, keptItemKeys, unprotectedBytes);
11244
11284
  await Promise.all(persistedItemEntries.filter(({ itemKey }) => !keptItemKeys.has(itemKey)).map(({ itemKey }) => itemNamespace.remove(itemKey)));
11245
- for (const { itemKey } of persistedItemEntries) if (!keptItemKeys.has(itemKey)) forgetPersistedItem(itemKey);
11285
+ for (const { itemKey, lastAccessAt } of persistedItemEntries) if (!keptItemKeys.has(itemKey)) {
11286
+ rememberBudgetEvictedEntry(budgetEvictedItemRecency, itemKey, lastAccessAt, itemSnapshotByKey.get(itemKey), storeRef !== null && storeRef.state.items[itemKey] != null);
11287
+ forgetPersistedItem(itemKey);
11288
+ }
11246
11289
  knownPersistedItemKeys = keptItemKeys;
11247
11290
  }
11248
11291
  async function flushPersistedState() {
@@ -11311,13 +11354,20 @@ function setupListQueryPersistence(config, options = {}) {
11311
11354
  }
11312
11355
  const limitedQuery = limitPersistedQueryItems(queryItemsToPersist, query.hasMore, maxQuerySize);
11313
11356
  for (const itemKey of limitedQuery.itemKeys) persistedQueryItemKeys.add(itemKey);
11314
- nextQueryKeys.add(queryKey);
11315
11357
  const nextValue = {
11316
11358
  payload: query.payload,
11317
11359
  items: limitedQuery.itemKeys,
11318
11360
  hasMore: limitedQuery.hasMore
11319
11361
  };
11320
11362
  const nextSnapshot = JSON.stringify(nextValue);
11363
+ if (!previousKnownLocalQueryKeys.has(queryKey)) {
11364
+ const evictedRecency = budgetEvictedQueryRecency.get(queryKey);
11365
+ if (evictedRecency !== void 0) {
11366
+ if (evictedRecency.snapshot === nextSnapshot) continue;
11367
+ budgetEvictedQueryRecency.delete(queryKey);
11368
+ }
11369
+ }
11370
+ nextQueryKeys.add(queryKey);
11321
11371
  if (querySnapshotByKey.get(queryKey) === nextSnapshot && previousKnownLocalQueryKeys.has(queryKey)) continue;
11322
11372
  querySnapshotByKey.set(queryKey, nextSnapshot);
11323
11373
  if (localStorageAdapter === null) querySizeBytesByKey.set(queryKey, estimateAsyncQueryEntrySizeBytes({
@@ -11336,11 +11386,12 @@ function setupListQueryPersistence(config, options = {}) {
11336
11386
  removedQueryKeys.add(queryKey);
11337
11387
  }
11338
11388
  for (const [itemKey, item] of itemEntries) {
11389
+ const hasItemInState = Object.hasOwn(state.items, itemKey);
11339
11390
  const hasItemQueryInState = Object.hasOwn(state.itemQueries, itemKey);
11340
11391
  const hasLoadedFieldsInState = Object.hasOwn(state.itemLoadedFields, itemKey);
11341
11392
  const hydratedItem = hasItemQueryInState && hasLoadedFieldsInState ? void 0 : readHydratedItem(itemKey);
11342
11393
  const itemQuery = hasItemQueryInState ? state.itemQueries[itemKey] : hydratedItem?.itemQuery;
11343
- const loadedFields = hasLoadedFieldsInState ? state.itemLoadedFields[itemKey] : hydratedItem?.loadedFields;
11394
+ const loadedFields = hasItemInState ? state.itemLoadedFields[itemKey] : hydratedItem?.loadedFields;
11344
11395
  if (item === null || itemQuery == null) {
11345
11396
  if (previousKnownLocalItemKeys.has(itemKey)) {
11346
11397
  tasks.push(itemNamespace.remove(itemKey));
@@ -11377,6 +11428,16 @@ function setupListQueryPersistence(config, options = {}) {
11377
11428
  loadedFields
11378
11429
  };
11379
11430
  const nextSnapshot = JSON.stringify(nextValue);
11431
+ if (!previousKnownLocalItemKeys.has(itemKey)) {
11432
+ const evictedRecency = budgetEvictedItemRecency.get(itemKey);
11433
+ if (evictedRecency !== void 0) {
11434
+ if (evictedRecency.snapshot === nextSnapshot) {
11435
+ nextItemKeys.delete(itemKey);
11436
+ continue;
11437
+ }
11438
+ budgetEvictedItemRecency.delete(itemKey);
11439
+ }
11440
+ }
11380
11441
  if (itemSnapshotByKey.get(itemKey) === nextSnapshot && previousKnownLocalItemKeys.has(itemKey)) continue;
11381
11442
  itemSnapshotByKey.set(itemKey, nextSnapshot);
11382
11443
  if (localStorageAdapter === null) itemSizeBytesByKey.set(itemKey, estimateAsyncItemEntrySizeBytes({
@@ -11400,6 +11461,10 @@ function setupListQueryPersistence(config, options = {}) {
11400
11461
  forgetPersistedItem(itemKey);
11401
11462
  removedItemKeys.add(itemKey);
11402
11463
  }
11464
+ if (removedQueryKeys.size > 0) budgetEvictedQueryRecency.clear();
11465
+ if (removedItemKeys.size > 0) budgetEvictedItemRecency.clear();
11466
+ for (const queryKey of budgetEvictedQueryRecency.keys()) if (!Object.hasOwn(state.queries, queryKey)) budgetEvictedQueryRecency.delete(queryKey);
11467
+ for (const itemKey of budgetEvictedItemRecency.keys()) if (state.items[itemKey] == null) budgetEvictedItemRecency.delete(itemKey);
11403
11468
  await Promise.all(tasks);
11404
11469
  knownPersistedItemKeys = new Set(previousItemKeys);
11405
11470
  for (const itemKey of removedItemKeys) knownPersistedItemKeys.delete(itemKey);
@@ -11483,17 +11548,21 @@ function setupListQueryPersistence(config, options = {}) {
11483
11548
  sizeBytes: rememberQueryMetadataSize(entry.key, entry.sizeBytes)
11484
11549
  });
11485
11550
  }
11551
+ const inStateQueryLastAccessAt = /* @__PURE__ */ new Map();
11486
11552
  for (const [queryKey, queryData] of finalQueryDataByKey) {
11553
+ const existingMetadata = metadataByKey.get(queryKey);
11554
+ const lastAccessAt = existingMetadata?.lastAccessAt ?? getBudgetEvictedLastAccessAt(budgetEvictedQueryRecency, queryKey, queryData, commitTimestamp);
11555
+ inStateQueryLastAccessAt.set(queryKey, lastAccessAt);
11487
11556
  const sizeBytes = estimateAsyncQueryEntrySizeBytes({
11488
- currentCustomMetadata: metadataByKey.get(queryKey)?.customMetadata,
11489
- lastAccessAt: commitTimestamp,
11557
+ currentCustomMetadata: existingMetadata?.customMetadata,
11558
+ lastAccessAt,
11490
11559
  protectedKeysSnapshotSet: protectedRefs,
11491
11560
  queryKey,
11492
11561
  value: queryData
11493
11562
  });
11494
11563
  finalQuerySizeBytesByKey.set(queryKey, sizeBytes);
11495
11564
  candidateEntries.push({
11496
- lastAccessAt: commitTimestamp,
11565
+ lastAccessAt,
11497
11566
  offlineProtected: protectedQueryKeys.has(queryKey) || protectedRefs?.has(serializeProtectedRef$1({
11498
11567
  key: queryKey,
11499
11568
  kind: "listQuery.query",
@@ -11507,20 +11576,32 @@ function setupListQueryPersistence(config, options = {}) {
11507
11576
  const { keptKeys: keptQueryKeys, unprotectedBytes: queryUnprotectedBytes } = keepEntriesWithinByteBudget(candidateEntries, (entry) => entry.queryKey, (entry) => entry.lastAccessAt, (entry) => entry.sizeBytes, (entry) => pinnedQueryKeys.has(entry.queryKey), (entry) => entry.offlineProtected, maxQueryBytes);
11508
11577
  logQueryByteBudgetCleanup("flush", candidateEntries.length, keptQueryKeys, queryUnprotectedBytes);
11509
11578
  finalPersistedQueryKeys.clear();
11510
- for (const queryKey of keptQueryKeys) finalPersistedQueryKeys.add(queryKey);
11579
+ for (const queryKey of keptQueryKeys) {
11580
+ finalPersistedQueryKeys.add(queryKey);
11581
+ budgetEvictedQueryRecency.delete(queryKey);
11582
+ }
11583
+ for (const queryKey of budgetEvictedQueryRecency.keys()) if (!finalQueryDataByKey.has(queryKey)) budgetEvictedQueryRecency.delete(queryKey);
11511
11584
  const evictedQueryKeys = [];
11512
11585
  for (const queryKey of finalQueryDataByKey.keys()) if (!finalPersistedQueryKeys.has(queryKey)) evictedQueryKeys.push(queryKey);
11513
- for (const queryKey of evictedQueryKeys) finalQueryDataByKey.delete(queryKey);
11586
+ for (const queryKey of evictedQueryKeys) {
11587
+ const queryData = finalQueryDataByKey.get(queryKey);
11588
+ if (queryData !== void 0) budgetEvictedQueryRecency.set(queryKey, {
11589
+ lastAccessAt: inStateQueryLastAccessAt.get(queryKey) ?? commitTimestamp,
11590
+ snapshot: JSON.stringify(queryData)
11591
+ });
11592
+ finalQueryDataByKey.delete(queryKey);
11593
+ }
11514
11594
  const persistedQueryItemKeys = /* @__PURE__ */ new Set();
11515
11595
  for (const queryData of finalQueryDataByKey.values()) for (const itemKey of queryData.items) persistedQueryItemKeys.add(itemKey);
11516
11596
  const finalItemDataByKey = /* @__PURE__ */ new Map();
11517
11597
  const finalPersistedItemKeys = new Set(previousKnownLocalItemKeys);
11518
11598
  for (const [itemKey, item] of itemEntries) {
11599
+ const hasItemInState = Object.hasOwn(state.items, itemKey);
11519
11600
  const hasItemQueryInState = Object.hasOwn(state.itemQueries, itemKey);
11520
11601
  const hasLoadedFieldsInState = Object.hasOwn(state.itemLoadedFields, itemKey);
11521
11602
  const hydratedItem = hasItemQueryInState && hasLoadedFieldsInState ? void 0 : readHydratedItem(itemKey);
11522
11603
  const itemQuery = hasItemQueryInState ? state.itemQueries[itemKey] : hydratedItem?.itemQuery;
11523
- const loadedFields = hasLoadedFieldsInState ? state.itemLoadedFields[itemKey] : hydratedItem?.loadedFields;
11604
+ const loadedFields = hasItemInState ? state.itemLoadedFields[itemKey] : hydratedItem?.loadedFields;
11524
11605
  if (item === null || itemQuery == null) {
11525
11606
  if (previousKnownLocalItemKeys.has(itemKey)) finalPersistedItemKeys.delete(itemKey);
11526
11607
  continue;
@@ -11541,7 +11622,7 @@ function setupListQueryPersistence(config, options = {}) {
11541
11622
  };
11542
11623
  finalItemDataByKey.set(itemKey, {
11543
11624
  metadata: {
11544
- ...Array.isArray(loadedFields) ? { f: loadedFields } : {},
11625
+ ...loadedFields !== void 0 ? { f: loadedFields } : {},
11545
11626
  p: itemQuery.payload,
11546
11627
  ...getItemDerivedGroup ? { g: getItemDerivedGroup(item, itemQuery.payload) } : {}
11547
11628
  },
@@ -11574,12 +11655,15 @@ function setupListQueryPersistence(config, options = {}) {
11574
11655
  sizeBytes: rememberItemMetadataSize(entry.key, entry.sizeBytes)
11575
11656
  });
11576
11657
  }
11658
+ const inStateItemLastAccessAt = /* @__PURE__ */ new Map();
11577
11659
  for (const [itemKey, entry] of finalItemDataByKey) {
11578
11660
  const existingMetadata = itemMetadataByKey.get(itemKey);
11661
+ const lastAccessAt = existingMetadata?.lastAccessAt ?? getBudgetEvictedLastAccessAt(budgetEvictedItemRecency, itemKey, entry.value, itemCommitTimestamp);
11662
+ inStateItemLastAccessAt.set(itemKey, lastAccessAt);
11579
11663
  const sizeBytes = estimateAsyncItemEntrySizeBytes({
11580
11664
  currentCustomMetadata: existingMetadata?.customMetadata,
11581
11665
  itemKey,
11582
- lastAccessAt: existingMetadata?.lastAccessAt ?? itemCommitTimestamp,
11666
+ lastAccessAt,
11583
11667
  nextCustomMetadata: entry.metadata,
11584
11668
  protectedKeysSnapshotSet: protectedRefs,
11585
11669
  value: entry.value
@@ -11587,7 +11671,7 @@ function setupListQueryPersistence(config, options = {}) {
11587
11671
  finalItemSizeBytesByKey.set(itemKey, sizeBytes);
11588
11672
  itemCandidateEntries.push({
11589
11673
  itemKey,
11590
- lastAccessAt: existingMetadata?.lastAccessAt ?? itemCommitTimestamp,
11674
+ lastAccessAt,
11591
11675
  offlineProtected: protectedItemKeys.has(itemKey) || protectedRefs?.has(serializeProtectedRef$1({
11592
11676
  key: itemKey,
11593
11677
  kind: "listQuery.item",
@@ -11600,10 +11684,21 @@ function setupListQueryPersistence(config, options = {}) {
11600
11684
  const { keptKeys: keptItemKeys, unprotectedBytes: itemUnprotectedBytes } = keepEntriesWithinByteBudget(itemCandidateEntries, (entry) => entry.itemKey, (entry) => entry.lastAccessAt, (entry) => entry.sizeBytes, (entry) => pinnedItemKeys.has(entry.itemKey), (entry) => entry.offlineProtected, maxItemBytes);
11601
11685
  logItemByteBudgetCleanup("flush", itemCandidateEntries.length, keptItemKeys, itemUnprotectedBytes);
11602
11686
  finalPersistedItemKeys.clear();
11603
- for (const itemKey of keptItemKeys) finalPersistedItemKeys.add(itemKey);
11687
+ for (const itemKey of keptItemKeys) {
11688
+ finalPersistedItemKeys.add(itemKey);
11689
+ budgetEvictedItemRecency.delete(itemKey);
11690
+ }
11691
+ for (const itemKey of budgetEvictedItemRecency.keys()) if (!finalItemDataByKey.has(itemKey)) budgetEvictedItemRecency.delete(itemKey);
11604
11692
  const evictedItemKeys = [];
11605
11693
  for (const itemKey of finalItemDataByKey.keys()) if (!finalPersistedItemKeys.has(itemKey)) evictedItemKeys.push(itemKey);
11606
- for (const itemKey of evictedItemKeys) finalItemDataByKey.delete(itemKey);
11694
+ for (const itemKey of evictedItemKeys) {
11695
+ const entry = finalItemDataByKey.get(itemKey);
11696
+ if (entry !== void 0) budgetEvictedItemRecency.set(itemKey, {
11697
+ lastAccessAt: inStateItemLastAccessAt.get(itemKey) ?? itemCommitTimestamp,
11698
+ snapshot: JSON.stringify(entry.value)
11699
+ });
11700
+ finalItemDataByKey.delete(itemKey);
11701
+ }
11607
11702
  const removedQueryKeys = [...previousKnownLocalQueryKeys].filter((queryKey) => !finalPersistedQueryKeys.has(queryKey));
11608
11703
  const removedItemKeys = [...previousKnownLocalItemKeys].filter((itemKey) => !finalPersistedItemKeys.has(itemKey));
11609
11704
  const queryUpserts = /* @__PURE__ */ new Map();
@@ -11736,6 +11831,8 @@ function setupListQueryPersistence(config, options = {}) {
11736
11831
  querySnapshotByKey.clear();
11737
11832
  itemSizeBytesByKey.clear();
11738
11833
  querySizeBytesByKey.clear();
11834
+ budgetEvictedItemRecency.clear();
11835
+ budgetEvictedQueryRecency.clear();
11739
11836
  hydratedPersistedItemKeys.clear();
11740
11837
  hydratedPersistedQueryKeys.clear();
11741
11838
  syncHydrationItemMissCache.clearAll();
@@ -11761,13 +11858,63 @@ function setupListQueryPersistence(config, options = {}) {
11761
11858
  }
11762
11859
  //#endregion
11763
11860
  //#region src/listQueryStore/itemFieldUtils.ts
11764
- function fallbackItemHasRequestedFields(fallbackItemState, requestedFields) {
11765
- const loadedFields = fallbackItemState?.loadedFields ?? [];
11766
- if (requestedFields.every((field) => loadedFields.includes(field))) return true;
11861
+ function hasFullyLoadedFields(loadedFields) {
11862
+ return loadedFields === "*";
11863
+ }
11864
+ /**
11865
+ * Whether a snapshot should be treated as holding every field of the item.
11866
+ * True when the tracked `loadedFields` is the `'*'` sentinel, or when the
11867
+ * snapshot carries no field metadata but `inferFields` reports the item is
11868
+ * complete (`'*'`) — e.g. manually inserted items, offline optimistic rows, or
11869
+ * persisted fallback snapshots.
11870
+ */
11871
+ function snapshotIsFullyLoaded(loadedFields, item, inferFields) {
11872
+ if (loadedFields === "*") return true;
11873
+ if (!item) return false;
11874
+ return inferFields(item) === "*";
11875
+ }
11876
+ /**
11877
+ * Like {@link snapshotIsFullyLoaded}, but also returns `false` when the item is
11878
+ * awaiting a full ('*') re-fetch after a full invalidation. A fully-loaded
11879
+ * snapshot that was fully invalidated has its `loadedFields` reset while the
11880
+ * (now stale) item data is still present, so `inferFields` would otherwise
11881
+ * wrongly vouch for it as complete.
11882
+ */
11883
+ function snapshotIsFullyLoadedAndFresh(itemKey, loadedFields, item, inferFields, itemsPendingFullInvalidation) {
11884
+ if (loadedFields !== "*" && itemsPendingFullInvalidation.has(itemKey)) return false;
11885
+ return snapshotIsFullyLoaded(loadedFields, item, inferFields);
11886
+ }
11887
+ /**
11888
+ * Missing requested fields for an item snapshot, letting `inferFields` vouch
11889
+ * for metadata-free item data (e.g. client-created items) — except for stale
11890
+ * fields awaiting a re-fetch after an invalidation (per-field or full), when
11891
+ * the item's stale data must not be vouched for.
11892
+ */
11893
+ function getStaleOrMissingRequestedFields(itemKey, loadedFields, item, requestedFields, inferFields, itemsPendingFullInvalidation, pendingInvalidationFields) {
11894
+ const staleRequestedFields = pendingInvalidationFields.length > 0 ? requestedFields.filter((field) => pendingInvalidationFields.includes(field)) : [];
11895
+ const missingLoadedFields = excludeLoadedFields(loadedFields, requestedFields);
11896
+ if (missingLoadedFields.length === 0) return staleRequestedFields;
11897
+ const unvouchedMissingFields = loadedFields !== "*" && itemsPendingFullInvalidation.has(itemKey) || !item ? missingLoadedFields : (() => {
11898
+ const inferredFields = inferFields(item);
11899
+ return missingLoadedFields.filter((field) => inferredFields !== "*" && !inferredFields.includes(field));
11900
+ })();
11901
+ if (staleRequestedFields.length === 0) return unvouchedMissingFields;
11902
+ const resultFields = new Set([...staleRequestedFields, ...unvouchedMissingFields]);
11903
+ return requestedFields.filter((field) => resultFields.has(field));
11904
+ }
11905
+ function fallbackItemHasRequestedFields(fallbackItemState, requestedFields, inferFields) {
11906
+ return getFallbackMissingRequestedFields(fallbackItemState, requestedFields, inferFields).length === 0;
11907
+ }
11908
+ function getFallbackMissingRequestedFields(fallbackItemState, requestedFields, inferFields) {
11909
+ const loadedFields = fallbackItemState?.loadedFields;
11910
+ if (loadedFields === "*") return [];
11911
+ const missingLoadedFields = requestedFields.filter((field) => !(loadedFields?.includes(field) ?? false));
11912
+ if (missingLoadedFields.length === 0) return [];
11767
11913
  const item = fallbackItemState?.item;
11768
- if (!item || typeof item !== "object") return false;
11769
- const itemRecord = __LEGIT_CAST__(item);
11770
- return requestedFields.every((field) => field in itemRecord && itemRecord[field] !== void 0);
11914
+ if (!item) return missingLoadedFields;
11915
+ const inferredFields = inferFields(item);
11916
+ if (inferredFields === "*") return [];
11917
+ return missingLoadedFields.filter((field) => !inferredFields.includes(field));
11771
11918
  }
11772
11919
  /**
11773
11920
  * Returns the fields from `requestedFields` that are not yet present in
@@ -11775,6 +11922,7 @@ function fallbackItemHasRequestedFields(fallbackItemState, requestedFields) {
11775
11922
  */
11776
11923
  function excludeLoadedFields(loadedFields, requestedFields) {
11777
11924
  if (!requestedFields || requestedFields.length === 0) return [];
11925
+ if (loadedFields === "*") return [];
11778
11926
  if (!loadedFields || loadedFields.length === 0) return [...requestedFields];
11779
11927
  return requestedFields.filter((field) => !loadedFields.includes(field));
11780
11928
  }
@@ -11789,10 +11937,11 @@ function applyPartialItemMerge(draft, itemKey, data, fields, partialResources) {
11789
11937
  const merged = partialResources.mergeItems(prev, data);
11790
11938
  draft.items[itemKey] = reusePrevIfEqual(prev, merged);
11791
11939
  if (fields && fields.length > 0) {
11792
- const existingFields = draft.itemLoadedFields[itemKey] ?? [];
11793
- const fieldSet = new Set([...existingFields, ...fields]);
11940
+ const existingFields = draft.itemLoadedFields[itemKey];
11941
+ if (existingFields === "*") return merged;
11942
+ const fieldSet = new Set([...existingFields ?? [], ...fields]);
11794
11943
  draft.itemLoadedFields[itemKey] = Array.from(fieldSet).sort();
11795
- } else draft.itemLoadedFields[itemKey] = Object.keys(merged).sort();
11944
+ } else draft.itemLoadedFields[itemKey] = "*";
11796
11945
  return merged;
11797
11946
  }
11798
11947
  //#endregion
@@ -12121,7 +12270,7 @@ async function executeQueryFetch(requests, fetchCtx, store, normalizedFetchListF
12121
12270
  //#endregion
12122
12271
  //#region src/listQueryStore/createFetchApi.ts
12123
12272
  /** @internal */
12124
- function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchItemFn, batchFetchItemFn, getItemsBatchKey, errorNormalizer, partialResources, lowPriorityThrottleMs, getCoalescingWindowMs, mediumPriorityDelayMs, dynamicRealtimeThrottleMs, onSchedulerEvent, usesRealTimeUpdates, defaultQuerySize, maxItemBatchSize, getQueryKey, getItemKey, normalizeFieldsOption, syncHydrationEnabled, preloadQueries_, preloadItems_, persistence, testInitialLastFetchStartTime, onQueryFetchStart, onQueryFetchSettled, onItemFetchStart, onItemFetchSettled, offlineController) {
12273
+ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchItemFn, batchFetchItemFn, getItemsBatchKey, errorNormalizer, partialResources, lowPriorityThrottleMs, getCoalescingWindowMs, mediumPriorityDelayMs, dynamicRealtimeThrottleMs, onSchedulerEvent, usesRealTimeUpdates, defaultQuerySize, maxItemBatchSize, getQueryKey, getItemKey, normalizeFieldsOption, syncHydrationEnabled, preloadQueries_, preloadItems_, persistence, testInitialLastFetchStartTime, onQueryFetchStart, onQueryFetchSettled, onItemFetchStart, onItemFetchSettled, offlineController, itemPendingInvalidationFields, itemsPendingFullInvalidation) {
12125
12274
  const noFetchItemFnError = "No fetchItemFn was provided";
12126
12275
  const querySchedulers = /* @__PURE__ */ new Map();
12127
12276
  const queryInitialFetchStartTime = /* @__PURE__ */ new Map();
@@ -12532,7 +12681,7 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12532
12681
  const materializedState = readMaterializedItemState(itemKey);
12533
12682
  const hydratedState = persistence.readHydratedItem(itemKey);
12534
12683
  const state = materializedState ?? hydratedState;
12535
- if (!state || state.item == null || state.itemQuery == null || partialResources && fields && fields.length > 0 && !fallbackItemHasRequestedFields(state, fields)) return "skipped";
12684
+ if (!state || state.item == null || state.itemQuery == null || partialResources && fields && fields.length > 0 && !fallbackItemHasRequestedFields(state, fields, partialResources.inferFields)) return "skipped";
12536
12685
  appendedItemKeys.push(itemKey);
12537
12686
  if (!materializedState && hydratedState) appendedHydratedItems.push({
12538
12687
  itemKey,
@@ -12552,7 +12701,7 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12552
12701
  for (const { itemKey, state } of appendedHydratedItems) {
12553
12702
  draft.items[itemKey] = state.item;
12554
12703
  draft.itemQueries[itemKey] = state.itemQuery;
12555
- draft.itemLoadedFields[itemKey] = state.loadedFields;
12704
+ if (state.loadedFields !== void 0) draft.itemLoadedFields[itemKey] = state.loadedFields;
12556
12705
  }
12557
12706
  }, { action: "persistent-storage-load-more" });
12558
12707
  return "triggered";
@@ -12564,10 +12713,25 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12564
12713
  return item && itemPayload ? itemDataSelector(item, itemPayload, itemKey) : false;
12565
12714
  });
12566
12715
  }
12567
- function hasStaleRequestedFields(itemKey, fields) {
12568
- const invalidationFields = store.state.itemFieldInvalidationFields[itemKey];
12569
- if (!invalidationFields || invalidationFields.length === 0) return false;
12570
- return fields.some((field) => invalidationFields.includes(field));
12716
+ /**
12717
+ * Fields of an item still awaiting an invalidation re-fetch. Reads the
12718
+ * state-level record first; when a fetch already consumed it (the record is
12719
+ * deleted before the response lands), falls back to the in-memory pending
12720
+ * list minus the fields that were re-loaded since the invalidation.
12721
+ */
12722
+ function getUnresolvedPendingInvalidationFields(itemKey) {
12723
+ const stateInvalidationFields = store.state.itemFieldInvalidationFields[itemKey];
12724
+ if (stateInvalidationFields && stateInvalidationFields.length > 0) return stateInvalidationFields;
12725
+ return excludeLoadedFields(store.state.itemLoadedFields[itemKey], itemPendingInvalidationFields.get(itemKey));
12726
+ }
12727
+ /**
12728
+ * Whether an item snapshot is fresh enough for a require-fresh
12729
+ * (`ignoreStaleState: true`) full ('*') read: no unresolved full ('*')
12730
+ * invalidation and no fields still awaiting an invalidation re-fetch.
12731
+ */
12732
+ function itemSnapshotIsFresh(itemKey) {
12733
+ if (store.state.itemLoadedFields[itemKey] !== "*" && itemsPendingFullInvalidation.has(itemKey)) return false;
12734
+ return getUnresolvedPendingInvalidationFields(itemKey).length === 0;
12571
12735
  }
12572
12736
  async function awaitListQueryFetch(params, options = {}) {
12573
12737
  const queryKey = getQueryKey(params);
@@ -12603,7 +12767,7 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12603
12767
  if (!hydratedItem) continue;
12604
12768
  draft.items[itemKey] = hydratedItem.item;
12605
12769
  draft.itemQueries[itemKey] = hydratedItem.itemQuery;
12606
- draft.itemLoadedFields[itemKey] = hydratedItem.loadedFields;
12770
+ if (hydratedItem.loadedFields !== void 0) draft.itemLoadedFields[itemKey] = hydratedItem.loadedFields;
12607
12771
  }
12608
12772
  }, { action: "persistent-storage-hydrate" });
12609
12773
  }
@@ -12630,11 +12794,12 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12630
12794
  async function getQueryFromStateOrFetch(params, options = {}) {
12631
12795
  const queryKey = getQueryKey(params);
12632
12796
  const fields = normalizeFieldsOption(options.fields);
12797
+ const fullFieldsRequested = options.fields === "*";
12633
12798
  const query = getQueryStateByKey(queryKey);
12634
12799
  const includeStale = !!options.ignoreStaleState;
12635
12800
  const cachedQueryCanBeUsed = !!query?.wasLoaded && (!includeStale || query.status === "success" && !query.error && !query.refetchOnMount);
12636
12801
  if (query && cachedQueryCanBeUsed) {
12637
- if (!(partialResources && Array.isArray(fields) && fields.length > 0)) return Result.ok({
12802
+ if (!(partialResources && (Array.isArray(fields) && fields.length > 0 || fullFieldsRequested))) return Result.ok({
12638
12803
  items: getQueryItems(query, (data, itemPayload) => ({
12639
12804
  data,
12640
12805
  itemPayload
@@ -12643,8 +12808,10 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12643
12808
  });
12644
12809
  if (!query.items.some((itemKey) => {
12645
12810
  const itemState = readItemState(itemKey);
12646
- const invalidation = includeStale ? store.state.itemFieldInvalidationFields[itemKey] : void 0;
12647
- return fields.some((field) => !fallbackItemHasRequestedFields(itemState, [field]) || (invalidation?.includes(field) ?? false));
12811
+ if (fullFieldsRequested) return !snapshotIsFullyLoaded(itemState?.loadedFields, itemState?.item, partialResources.inferFields) || includeStale && !itemSnapshotIsFresh(itemKey);
12812
+ const requestedFields = Array.isArray(fields) ? fields : [];
12813
+ if (includeStale) return getStaleOrMissingRequestedFields(itemKey, itemState?.loadedFields, itemState?.item, requestedFields, partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey)).length > 0;
12814
+ return getFallbackMissingRequestedFields(itemState, requestedFields, partialResources.inferFields).length > 0;
12648
12815
  })) return Result.ok({
12649
12816
  items: getQueryItems(query, (data, itemPayload) => ({
12650
12817
  data,
@@ -12705,7 +12872,7 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12705
12872
  store.produceState((draft) => {
12706
12873
  draft.items[itemKey] = hydratedItem.item;
12707
12874
  draft.itemQueries[itemKey] = hydratedItem.itemQuery;
12708
- draft.itemLoadedFields[itemKey] = hydratedItem.loadedFields;
12875
+ if (hydratedItem.loadedFields !== void 0) draft.itemLoadedFields[itemKey] = hydratedItem.loadedFields;
12709
12876
  }, { action: "persistent-storage-hydrate" });
12710
12877
  }
12711
12878
  }
@@ -12727,20 +12894,19 @@ function createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchIte
12727
12894
  async function getItemFromStateOrFetch(itemPayload, options = {}) {
12728
12895
  const itemKey = getItemKey(itemPayload);
12729
12896
  const fields = normalizeFieldsOption(options.fields);
12897
+ const fullFieldsRequested = options.fields === "*";
12730
12898
  const itemState = readItemState(itemKey);
12731
12899
  const item = itemState?.item;
12732
12900
  const itemQuery = itemState?.itemQuery;
12733
12901
  const includeStale = !!options.ignoreStaleState;
12734
- const needsFieldCheck = partialResources && Array.isArray(fields) && fields.length > 0;
12735
- const itemHasAllFields = !needsFieldCheck || fallbackItemHasRequestedFields(itemState, fields);
12902
+ const needsFieldCheck = partialResources && (Array.isArray(fields) && fields.length > 0 || fullFieldsRequested);
12903
+ const itemHasAllFields = !needsFieldCheck || (fullFieldsRequested ? snapshotIsFullyLoaded(itemState?.loadedFields, itemState?.item, partialResources.inferFields) : fallbackItemHasRequestedFields(itemState, Array.isArray(fields) ? fields : [], partialResources.inferFields));
12736
12904
  const itemQueryFresh = itemQuery?.status === "success" && !itemQuery.error && !itemQuery.refetchOnMount;
12737
- if (item != null && itemHasAllFields && (!includeStale || itemQueryFresh && (!needsFieldCheck || !hasStaleRequestedFields(itemKey, fields)))) return Result.ok(item);
12905
+ const staleOrMissingRequestedFields = needsFieldCheck && !fullFieldsRequested && includeStale ? getStaleOrMissingRequestedFields(itemKey, itemState?.loadedFields, item, Array.isArray(fields) ? fields : [], partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey)) : void 0;
12906
+ if (item != null && itemHasAllFields && (!includeStale || itemQueryFresh && (!needsFieldCheck || (fullFieldsRequested ? itemSnapshotIsFresh(itemKey) : staleOrMissingRequestedFields?.length === 0)))) return Result.ok(item);
12738
12907
  if (!fetchItemFn) throw new Error(noFetchItemFnError);
12739
12908
  let fieldsToFetch = options.fields;
12740
- if (needsFieldCheck && item != null && itemQueryFresh) {
12741
- const invalidation = includeStale ? store.state.itemFieldInvalidationFields[itemKey] : void 0;
12742
- fieldsToFetch = fields.filter((field) => !fallbackItemHasRequestedFields(itemState, [field]) || (invalidation?.includes(field) ?? false));
12743
- }
12909
+ if (needsFieldCheck && !fullFieldsRequested && item != null && itemQueryFresh) fieldsToFetch = staleOrMissingRequestedFields ?? getFallbackMissingRequestedFields(itemState, Array.isArray(fields) ? fields : [], partialResources.inferFields);
12744
12910
  const result = await awaitItemFetch(itemPayload, {
12745
12911
  timeoutMs: options.timeoutMs,
12746
12912
  fields: fieldsToFetch
@@ -12838,7 +13004,7 @@ const GET_ALL = () => true;
12838
13004
  //#endregion
12839
13005
  //#region src/listQueryStore/createMutationApi.ts
12840
13006
  /** @internal */
12841
- function createMutationApi(store, fetchItemFn, partialResources, optimisticListUpdates, onInvalidateQuery, onInvalidateItem, onMutationError, errorNormalizer, getItemKey, getQueriesKeyArray, getQueriesRelatedToItem, getItemsKeyArray, getOrCreateItemScheduler, getOrCreateQueryScheduler, deleteItemFetchResources, emitInvalidateQuery, emitInvalidateItem, blockWindowClose, offlineController, runWithBroadcastConsistency, publishQuerySnapshot, publishItemSnapshot, onOfflineTimelineEvent) {
13007
+ function createMutationApi(store, fetchItemFn, partialResources, optimisticListUpdates, onInvalidateQuery, onInvalidateItem, onMutationError, errorNormalizer, getItemKey, getQueriesKeyArray, getQueriesRelatedToItem, getItemsKeyArray, getOrCreateItemScheduler, getOrCreateQueryScheduler, deleteItemFetchResources, emitInvalidateQuery, emitInvalidateItem, blockWindowClose, offlineController, runWithBroadcastConsistency, publishQuerySnapshot, publishItemSnapshot, onOfflineTimelineEvent, itemPendingInvalidationFields, itemsPendingFullInvalidation) {
12842
13008
  const storeEvents = evtmitter();
12843
13009
  const deferredOptimisticQueryInvalidationsStack = [];
12844
13010
  const optimisticMutationQueryContextStack = [];
@@ -12898,7 +13064,6 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
12898
13064
  const queryInvalidationWasTriggered = /* @__PURE__ */ new Set();
12899
13065
  const itemInvalidationWasTriggered = /* @__PURE__ */ new Set();
12900
13066
  const itemFieldInvalidationPriorities = /* @__PURE__ */ new Map();
12901
- const itemPendingInvalidationFields = /* @__PURE__ */ new Map();
12902
13067
  function invalidateQueryAndItems(args) {
12903
13068
  const itemPayload = args.all ? GET_ALL : args.itemPayload;
12904
13069
  const queryPayload = args.all ? GET_ALL : args.queryPayload;
@@ -12938,7 +13103,7 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
12938
13103
  for (const { itemKey } of itemsKey) {
12939
13104
  const loadedFields = draft.itemLoadedFields[itemKey];
12940
13105
  if (!loadedFields) continue;
12941
- draft.itemLoadedFields[itemKey] = loadedFields.filter((f) => !invalidateFields.includes(f));
13106
+ if (loadedFields !== "*") draft.itemLoadedFields[itemKey] = loadedFields.filter((f) => !invalidateFields.includes(f));
12942
13107
  const existingInvalidationFields = draft.itemFieldInvalidationFields[itemKey] ?? [];
12943
13108
  draft.itemFieldInvalidationFields[itemKey] = Array.from(new Set([...existingInvalidationFields, ...invalidateFields])).sort();
12944
13109
  }
@@ -12959,10 +13124,28 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
12959
13124
  for (const { itemKey, payload } of itemsKey) {
12960
13125
  const item = store.state.itemQueries[itemKey];
12961
13126
  if (!item) continue;
12962
- const trackedInvalidationFields = partialResources ? Array.from(new Set([...store.state.itemLoadedFields[itemKey] ?? [], ...itemPendingInvalidationFields.get(itemKey) ?? []])).sort() : [];
12963
- const trackedInvalidationPriority = trackedInvalidationFields.length > 0 ? itemFieldInvalidationPriorities.get(itemKey) : void 0;
13127
+ let effectiveLoadedFields = store.state.itemLoadedFields[itemKey];
13128
+ if (partialResources && effectiveLoadedFields === void 0) {
13129
+ const itemState = store.state.items[itemKey];
13130
+ if (itemState) effectiveLoadedFields = partialResources.inferFields(itemState);
13131
+ }
13132
+ const itemWasFullyLoaded = partialResources && effectiveLoadedFields === "*";
13133
+ const trackedInvalidationFields = partialResources && !itemWasFullyLoaded ? Array.from(new Set([...effectiveLoadedFields === "*" ? [] : effectiveLoadedFields ?? [], ...itemPendingInvalidationFields.get(itemKey) ?? []])).sort() : [];
13134
+ const trackedInvalidationPriority = trackedInvalidationFields.length > 0 || itemsPendingFullInvalidation.has(itemKey) ? itemFieldInvalidationPriorities.get(itemKey) : void 0;
12964
13135
  const nextInvalidationPriority = trackedInvalidationPriority && fetchTypePriority[trackedInvalidationPriority] > fetchTypePriority[priority] ? trackedInvalidationPriority : priority;
12965
13136
  if ((item.refetchOnMount ? fetchTypePriority[item.refetchOnMount] : -1) >= fetchTypePriority[nextInvalidationPriority]) continue;
13137
+ if (itemWasFullyLoaded) {
13138
+ itemsPendingFullInvalidation.add(itemKey);
13139
+ itemPendingInvalidationFields.delete(itemKey);
13140
+ itemFieldInvalidationPriorities.set(itemKey, nextInvalidationPriority);
13141
+ } else if (trackedInvalidationFields.length > 0) {
13142
+ itemPendingInvalidationFields.set(itemKey, trackedInvalidationFields);
13143
+ itemFieldInvalidationPriorities.set(itemKey, nextInvalidationPriority);
13144
+ } else {
13145
+ itemPendingInvalidationFields.delete(itemKey);
13146
+ itemFieldInvalidationPriorities.delete(itemKey);
13147
+ }
13148
+ itemInvalidationWasTriggered.delete(itemKey);
12966
13149
  store.produceState((draft) => {
12967
13150
  const query = draft.itemQueries[itemKey];
12968
13151
  if (!query) return;
@@ -12972,14 +13155,6 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
12972
13155
  delete draft.itemFieldInvalidationFields[itemKey];
12973
13156
  }
12974
13157
  }, { action: "invalidate-item" });
12975
- if (trackedInvalidationFields.length > 0) {
12976
- itemPendingInvalidationFields.set(itemKey, trackedInvalidationFields);
12977
- itemFieldInvalidationPriorities.set(itemKey, nextInvalidationPriority);
12978
- } else {
12979
- itemPendingInvalidationFields.delete(itemKey);
12980
- itemFieldInvalidationPriorities.delete(itemKey);
12981
- }
12982
- itemInvalidationWasTriggered.delete(itemKey);
12983
13158
  emitInvalidateItem({
12984
13159
  priority: nextInvalidationPriority,
12985
13160
  itemKey
@@ -13197,6 +13372,7 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
13197
13372
  for (const { itemKey } of itemsId) {
13198
13373
  itemFieldInvalidationPriorities.delete(itemKey);
13199
13374
  itemPendingInvalidationFields.delete(itemKey);
13375
+ itemsPendingFullInvalidation.delete(itemKey);
13200
13376
  itemInvalidationWasTriggered.delete(itemKey);
13201
13377
  publishItemSnapshot(itemKey);
13202
13378
  }
@@ -13208,6 +13384,7 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
13208
13384
  itemInvalidationWasTriggered.clear();
13209
13385
  itemFieldInvalidationPriorities.clear();
13210
13386
  itemPendingInvalidationFields.clear();
13387
+ itemsPendingFullInvalidation.clear();
13211
13388
  }
13212
13389
  async function performMutation(payload, { optimisticUpdate, mutation, silentErrors, revalidateOnSuccess, onSuccess, onError, debounce, offline, upload }) {
13213
13390
  const payloadToUse = payload === null ? [] : payload;
@@ -13287,7 +13464,6 @@ function createMutationApi(store, fetchItemFn, partialResources, optimisticListU
13287
13464
  queryInvalidationWasTriggered,
13288
13465
  itemInvalidationWasTriggered,
13289
13466
  itemFieldInvalidationPriorities,
13290
- itemPendingInvalidationFields,
13291
13467
  invalidateQueryAndItems,
13292
13468
  invalidateItem,
13293
13469
  startItemMutation,
@@ -13652,7 +13828,7 @@ const cacheMissError = {
13652
13828
  id: "cache-miss",
13653
13829
  message: "Cache miss"
13654
13830
  };
13655
- function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus: allItemsReturnIdleStatus, returnRefetchingStatus: allItemsReturnRefetchingStatus, showPartialAsRefetching: allItemsShowPartialAsRefetching, disableRefetches: allItemsDisableRefetches, disableRefetchOnMount: allItemsDisableRefetchOnMount, isOffScreen: allItemsIsOffScreen, debouncePayload }, store, events, getItemKey, registerActiveItems, touchItems, scheduleAutomaticItemFetch, preloadItems, preloadItemsBeforePaint, readFallbackItemState, itemInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, globalDisableRefetchOnMount, fetchItemFn, partialResources, offlineEntities, offlineOverlays) {
13831
+ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus: allItemsReturnIdleStatus, returnRefetchingStatus: allItemsReturnRefetchingStatus, showPartialAsRefetching: allItemsShowPartialAsRefetching, disableRefetches: allItemsDisableRefetches, disableRefetchOnMount: allItemsDisableRefetchOnMount, isOffScreen: allItemsIsOffScreen, debouncePayload }, store, events, getItemKey, registerActiveItems, touchItems, scheduleAutomaticItemFetch, preloadItems, preloadItemsBeforePaint, readFallbackItemState, itemInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, itemsPendingFullInvalidation, globalDisableRefetchOnMount, fetchItemFn, partialResources, offlineEntities, offlineOverlays) {
13656
13832
  const isOffScreenFromContext = useContext(IsOffScreenContext);
13657
13833
  const queriesWithId = useMemo(() => {
13658
13834
  return items.map((itemProps) => {
@@ -13692,6 +13868,8 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13692
13868
  const offlineEntitiesByKey = useMemo(() => createOfflineEntityLookup(offlineEntities), [offlineEntities]);
13693
13869
  const activeOfflineOverlays = useMemo(() => filterActiveOfflineOverlays(offlineEntitiesByKey, offlineOverlays), [offlineEntitiesByKey, offlineOverlays]);
13694
13870
  const getUnresolvedPendingInvalidationFields = useCallback((itemKey) => {
13871
+ const stateInvalidationFields = store.state.itemFieldInvalidationFields[itemKey];
13872
+ if (stateInvalidationFields && stateInvalidationFields.length > 0) return stateInvalidationFields;
13695
13873
  return excludeLoadedFields(store.state.itemLoadedFields[itemKey], itemPendingInvalidationFields.get(itemKey));
13696
13874
  }, [itemPendingInvalidationFields, store]);
13697
13875
  const resultSelector = useCallback((state) => {
@@ -13755,20 +13933,21 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13755
13933
  let status = itemQuery.status;
13756
13934
  const itemFieldInvalidationFields = state.itemFieldInvalidationFields[itemKey];
13757
13935
  if (partialResources && Array.isArray(fields) && fields.length > 0 && (status === "success" || status === "refetching")) {
13758
- const missingFields = excludeLoadedFields(loadedFields, fields);
13759
- const hasMissingFields = missingFields.length > 0;
13760
- let missingFieldsAreAvailableInState = false;
13761
- if (hasMissingFields && rawItemState && typeof rawItemState === "object") {
13762
- const itemRecord = __LEGIT_CAST__(rawItemState);
13763
- missingFieldsAreAvailableInState = missingFields.every((f) => f in itemRecord && itemRecord[f] !== void 0);
13764
- }
13765
- if (hasMissingFields && !missingFieldsAreAvailableInState) status = hasCachedDataInState && showPartialAsRefetching ? "refetching" : "loading";
13936
+ if (getFallbackMissingRequestedFields({
13937
+ item: rawItemState,
13938
+ loadedFields
13939
+ }, fields, partialResources.inferFields).length > 0) status = hasCachedDataInState && showPartialAsRefetching ? "refetching" : "loading";
13940
+ } else if (partialResources && fields === "*" && (status === "success" || status === "refetching")) {
13941
+ if (!snapshotIsFullyLoaded(loadedFields, rawItemState, partialResources.inferFields)) status = hasCachedDataInState && showPartialAsRefetching ? "refetching" : "loading";
13942
+ else if (itemFieldInvalidationFields && itemFieldInvalidationFields.length > 0) status = "refetching";
13766
13943
  }
13767
13944
  if (partialResources && showPartialAsRefetching) {
13768
13945
  if (Array.isArray(fields) && fields.length > 0) {
13769
- const pendingRequestedFields = excludeLoadedFields(loadedFields, fields);
13946
+ const pendingRequestedFields = getStaleOrMissingRequestedFields(itemKey, loadedFields, rawItemState, fields, partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey));
13770
13947
  if (pendingRequestedFields.length > 0) loadingFields = pendingRequestedFields;
13771
- } else if (fields === "*" && itemFieldInvalidationFields && itemFieldInvalidationFields.length > 0) loadingFields = itemFieldInvalidationFields;
13948
+ } else if (fields === "*") {
13949
+ if (hasFullyLoadedFields(loadedFields) && itemFieldInvalidationFields && itemFieldInvalidationFields.length > 0) loadingFields = itemFieldInvalidationFields;
13950
+ }
13772
13951
  }
13773
13952
  if (partialResources && status === "refetching" && Array.isArray(fields) && fields.length > 0 && itemFieldInvalidationFields && !fields.some((f) => itemFieldInvalidationFields.includes(f))) status = "success";
13774
13953
  if (!returnRefetchingStatus && status === "refetching") status = "success";
@@ -13787,6 +13966,8 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13787
13966
  });
13788
13967
  }, [
13789
13968
  activeOfflineOverlays,
13969
+ getUnresolvedPendingInvalidationFields,
13970
+ itemsPendingFullInvalidation,
13790
13971
  loadFromStateOnly,
13791
13972
  offlineEntitiesByKey,
13792
13973
  partialResources,
@@ -13797,14 +13978,21 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13797
13978
  return queriesWithId.map(({ itemKey, fields }) => {
13798
13979
  const itemQuery = state.itemQueries[itemKey];
13799
13980
  const loadedFields = state.itemLoadedFields[itemKey] ?? [];
13800
- const missingRequestedFields = partialResources && Array.isArray(fields) && fields.length > 0 ? excludeLoadedFields(loadedFields, fields).sort() : [];
13981
+ const missingRequestedFields = partialResources && Array.isArray(fields) && fields.length > 0 ? getStaleOrMissingRequestedFields(itemKey, state.itemLoadedFields[itemKey], state.items[itemKey], fields, partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey)).sort() : [];
13982
+ const needsFullFetch = partialResources && fields === "*" ? !snapshotIsFullyLoaded(loadedFields, state.items[itemKey], partialResources.inferFields) || itemsPendingFullInvalidation.has(itemKey) && !hasFullyLoadedFields(loadedFields) : false;
13801
13983
  return {
13802
13984
  status: itemQuery?.status ?? null,
13803
13985
  refetchOnMount: itemQuery?.refetchOnMount ?? null,
13804
- missingRequestedFieldsKey: JSON.stringify(missingRequestedFields)
13986
+ missingRequestedFieldsKey: JSON.stringify(missingRequestedFields),
13987
+ needsFullFetch
13805
13988
  };
13806
13989
  });
13807
- }, [partialResources, queriesWithId]);
13990
+ }, [
13991
+ getUnresolvedPendingInvalidationFields,
13992
+ itemsPendingFullInvalidation,
13993
+ partialResources,
13994
+ queriesWithId
13995
+ ]);
13808
13996
  const storeState = store.useSelectorRC(resultSelector, { equalityFn: deepEqual });
13809
13997
  const visibleStoreState = useMemo(() => {
13810
13998
  return storeState.map((result, index) => {
@@ -13815,7 +14003,7 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13815
14003
  const fallbackItemState = readFallbackItemState(query.itemKey);
13816
14004
  const overlay = activeOfflineOverlays[result.itemStateKey];
13817
14005
  const hasOverlay = overlay !== void 0;
13818
- if (!(!partialResources || query.fields === void 0 || query.fields === "*" || fallbackItemHasRequestedFields(fallbackItemState, query.fields))) return result;
14006
+ if (!(!partialResources || query.fields === void 0 || (query.fields === "*" ? snapshotIsFullyLoaded(fallbackItemState?.loadedFields, fallbackItemState?.item, partialResources.inferFields) : fallbackItemHasRequestedFields(fallbackItemState, query.fields, partialResources.inferFields)))) return result;
13819
14007
  const fallbackItemQuery = hasOverlay && overlay.item !== null && fallbackItemState?.itemQuery == null ? {
13820
14008
  status: "success",
13821
14009
  wasLoaded: true,
@@ -13935,24 +14123,34 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13935
14123
  const itemFetchIsActive = itemState?.status === "loading" || itemState?.status === "refetching";
13936
14124
  if (partialResources && !shouldFetch) {
13937
14125
  const loadedFields = store.state.itemLoadedFields[itemKey] ?? [];
14126
+ const item = store.state.items[itemKey];
13938
14127
  const unresolvedPendingInvalidationFields = getUnresolvedPendingInvalidationFields(itemKey);
13939
- const invalidationPriority = unresolvedPendingInvalidationFields.length > 0 ? itemFieldInvalidationPriorities.get(itemKey) : void 0;
14128
+ const hasUnresolvedFullInvalidation = itemsPendingFullInvalidation.has(itemKey) && !hasFullyLoadedFields(loadedFields);
14129
+ const invalidationPriority = unresolvedPendingInvalidationFields.length > 0 || hasUnresolvedFullInvalidation ? itemFieldInvalidationPriorities.get(itemKey) : void 0;
13940
14130
  if (Array.isArray(fields) && fields.length > 0) {
13941
- const missingFields = excludeLoadedFields(loadedFields, fields);
14131
+ const affectedInvalidationFields = fields.filter((field) => unresolvedPendingInvalidationFields.includes(field));
14132
+ const staleOrMissingFields = getStaleOrMissingRequestedFields(itemKey, loadedFields, item, fields, partialResources.inferFields, itemsPendingFullInvalidation, unresolvedPendingInvalidationFields);
14133
+ const missingFields = loadedFields === "*" ? [] : staleOrMissingFields.filter((field) => !loadedFields.includes(field));
13942
14134
  const hasMissingFields = missingFields.length > 0;
13943
- const hasAffectedFieldInvalidation = unresolvedPendingInvalidationFields.length > 0 && fields.some((field) => unresolvedPendingInvalidationFields.includes(field));
13944
- if (hasMissingFields && !itemFetchIsActive) {
14135
+ const hasAffectedFieldInvalidation = affectedInvalidationFields.length > 0;
14136
+ const shouldFetchForInvalidation = hasAffectedFieldInvalidation && !ignoreItemsInRefetchOnMount.has(itemKey);
14137
+ if ((hasMissingFields || shouldFetchForInvalidation) && !itemFetchIsActive) {
13945
14138
  shouldFetch = true;
13946
14139
  requiredFetch = true;
13947
- fieldsToFetch = missingFields;
14140
+ fieldsToFetch = Array.from(new Set([...missingFields, ...affectedInvalidationFields]));
13948
14141
  if (fetchType === "lowPriority") fetchType = "highPriority";
13949
14142
  }
13950
14143
  if (hasAffectedFieldInvalidation && invalidationPriority && fetchTypePriority[invalidationPriority] > fetchTypePriority[fetchType]) fetchType = invalidationPriority;
13951
- } else if (fields === "*" && unresolvedPendingInvalidationFields.length > 0 && !itemFetchIsActive && !ignoreItemsInRefetchOnMount.has(itemKey)) {
13952
- shouldFetch = true;
13953
- requiredFetch = true;
13954
- fieldsToFetch = unresolvedPendingInvalidationFields;
13955
- if (invalidationPriority && fetchTypePriority[invalidationPriority] > fetchTypePriority[fetchType]) fetchType = invalidationPriority;
14144
+ } else if (fields === "*") {
14145
+ const missingFullItem = !snapshotIsFullyLoaded(loadedFields, item, partialResources.inferFields) || hasUnresolvedFullInvalidation;
14146
+ const shouldFetchForInvalidation = !missingFullItem && unresolvedPendingInvalidationFields.length > 0 && !ignoreItemsInRefetchOnMount.has(itemKey);
14147
+ if ((missingFullItem || shouldFetchForInvalidation) && !itemFetchIsActive) {
14148
+ shouldFetch = true;
14149
+ requiredFetch = true;
14150
+ fieldsToFetch = missingFullItem ? "*" : unresolvedPendingInvalidationFields;
14151
+ if (fetchType === "lowPriority") fetchType = "highPriority";
14152
+ if (invalidationPriority && fetchTypePriority[invalidationPriority] > fetchTypePriority[fetchType]) fetchType = invalidationPriority;
14153
+ }
13956
14154
  }
13957
14155
  }
13958
14156
  if (!shouldFetch && ignoreItemsInRefetchOnMount.has(itemKey)) continue;
@@ -13973,6 +14171,7 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13973
14171
  ignoreItemsInRefetchOnMount,
13974
14172
  itemFieldInvalidationPriorities,
13975
14173
  itemPendingInvalidationFields,
14174
+ itemsPendingFullInvalidation,
13976
14175
  loadFromStateOnly,
13977
14176
  partialResources,
13978
14177
  preloadItems,
@@ -13984,7 +14183,7 @@ function useMultipleItems(items, { selector, loadFromStateOnly, returnIdleStatus
13984
14183
  }
13985
14184
  //#endregion
13986
14185
  //#region src/listQueryStore/useMultipleListQueries.ts
13987
- function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allItemsReturnIdleStatus, returnRefetchingStatus: allItemsReturnRefetchingStatus, showPartialAsRefetching: allItemsShowPartialAsRefetching, omitPayload: allItemsOmitPayload, disableRefetches: allItemsDisableRefetches, disableRefetchOnMount: allItemsDisableRefetchOnMount, isOffScreen: allItemsIsOffScreen, loadSize: allItemsLoadSize, debouncePayload }, store, events, getQueryKey, registerActiveQueries, touchQueries, getQueryState, readFallbackQueryState, preloadQueries, preloadQueriesBeforePaint, preloadDerivedQueryItems, readFallbackItemState, scheduleAutomaticListQueryFetch, queryInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, globalDisableRefetchOnMount, partialResources, derivedQueries, isOfflineMode, offlineEntities, offlineOverlays) {
14186
+ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allItemsReturnIdleStatus, returnRefetchingStatus: allItemsReturnRefetchingStatus, showPartialAsRefetching: allItemsShowPartialAsRefetching, omitPayload: allItemsOmitPayload, disableRefetches: allItemsDisableRefetches, disableRefetchOnMount: allItemsDisableRefetchOnMount, isOffScreen: allItemsIsOffScreen, loadSize: allItemsLoadSize, debouncePayload }, store, events, getQueryKey, registerActiveQueries, touchQueries, getQueryState, readFallbackQueryState, preloadQueries, preloadQueriesBeforePaint, preloadDerivedQueryItems, readFallbackItemState, scheduleAutomaticListQueryFetch, queryInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, itemsPendingFullInvalidation, globalDisableRefetchOnMount, partialResources, derivedQueries, isOfflineMode, offlineEntities, offlineOverlays) {
13988
14187
  const isOffScreenFromContext = useContext(IsOffScreenContext);
13989
14188
  const queriesWithId = useMemo(() => {
13990
14189
  return queries.map((queryProps) => {
@@ -14093,6 +14292,8 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14093
14292
  partialResources
14094
14293
  ]);
14095
14294
  const getUnresolvedPendingInvalidationFields = useCallback((itemKey, state) => {
14295
+ const stateInvalidationFields = (state ? state.itemFieldInvalidationFields : store.state.itemFieldInvalidationFields)[itemKey];
14296
+ if (stateInvalidationFields && stateInvalidationFields.length > 0) return stateInvalidationFields;
14096
14297
  return excludeLoadedFields((state ? state.itemLoadedFields : store.state.itemLoadedFields)[itemKey], itemPendingInvalidationFields.get(itemKey));
14097
14298
  }, [itemPendingInvalidationFields, store]);
14098
14299
  const getHighestPendingInvalidationPriority = useCallback((itemKeys, requestedFields) => {
@@ -14234,34 +14435,49 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14234
14435
  const hasCachedItemsInState = effectiveQuery.query.items.some((itemKey) => {
14235
14436
  return state.items[itemKey] != null;
14236
14437
  });
14237
- if (partialResources && Array.isArray(fields) && fields.length > 0 && (status === "success" || status === "refetching")) {
14238
- const someItemMissingFields = effectiveQuery.query.items.some((itemKey) => {
14239
- const loadedFields = state.itemLoadedFields[itemKey] ?? [];
14240
- return fields.some((f) => !loadedFields.includes(f));
14241
- });
14242
- const someItemMissingFieldsInState = effectiveQuery.query.items.some((itemKey) => {
14243
- const item = state.items[itemKey];
14244
- if (!item || typeof item !== "object") return true;
14245
- const itemRecord = __LEGIT_CAST__(item);
14246
- return fields.some((f) => !(f in itemRecord) || itemRecord[f] === void 0);
14247
- });
14248
- if (someItemMissingFields) if (!hasCachedItemsInState) status = "loading";
14249
- else if (someItemMissingFieldsInState) status = showPartialAsRefetching ? "refetching" : "loading";
14438
+ let staleOrMissingRequestedFields;
14439
+ let hasAnyIncompleteItem = false;
14440
+ let hasAnyStaleItem = false;
14441
+ const statusCanBeOverridden = status === "success" || status === "refetching";
14442
+ if (partialResources && (statusCanBeOverridden || showPartialAsRefetching)) {
14443
+ if (Array.isArray(fields) && fields.length > 0) {
14444
+ staleOrMissingRequestedFields = /* @__PURE__ */ new Set();
14445
+ for (const itemKey of effectiveQuery.query.items) {
14446
+ for (const field of getStaleOrMissingRequestedFields(itemKey, state.itemLoadedFields[itemKey], state.items[itemKey], fields, partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey, state))) staleOrMissingRequestedFields.add(field);
14447
+ if (staleOrMissingRequestedFields.size === fields.length || !showPartialAsRefetching && staleOrMissingRequestedFields.size > 0) break;
14448
+ }
14449
+ } else if (fields === "*") {
14450
+ hasAnyIncompleteItem = effectiveQuery.query.items.some((itemKey) => {
14451
+ const item = state.items[itemKey];
14452
+ if (snapshotIsFullyLoaded(state.itemLoadedFields[itemKey], item, partialResources.inferFields)) return false;
14453
+ return !(itemsPendingFullInvalidation.has(itemKey) && item != null);
14454
+ });
14455
+ hasAnyStaleItem = !hasAnyIncompleteItem && effectiveQuery.query.items.some((itemKey) => !snapshotIsFullyLoadedAndFresh(itemKey, state.itemLoadedFields[itemKey], state.items[itemKey], partialResources.inferFields, itemsPendingFullInvalidation));
14456
+ }
14457
+ }
14458
+ if (partialResources && Array.isArray(fields) && statusCanBeOverridden && staleOrMissingRequestedFields && staleOrMissingRequestedFields.size > 0) {
14459
+ const someItemMissingFieldDataInState = effectiveQuery.query.items.some((itemKey) => getFallbackMissingRequestedFields({
14460
+ item: state.items[itemKey],
14461
+ loadedFields: state.itemLoadedFields[itemKey]
14462
+ }, fields, partialResources.inferFields).length > 0);
14463
+ if (!hasCachedItemsInState) status = "loading";
14464
+ else if (someItemMissingFieldDataInState) status = showPartialAsRefetching ? "refetching" : "loading";
14250
14465
  else status = "refetching";
14251
- } else if (partialResources && fields === "*" && (status === "success" || status === "refetching")) {
14252
- if (effectiveQuery.query.items.some((itemKey) => {
14466
+ } else if (partialResources && fields === "*" && statusCanBeOverridden) {
14467
+ const hasAnyFieldInvalidation = effectiveQuery.query.items.some((itemKey) => {
14253
14468
  const itemFieldInvalidationFields = state.itemFieldInvalidationFields[itemKey];
14254
14469
  return !!itemFieldInvalidationFields && itemFieldInvalidationFields.length > 0;
14255
- })) status = "refetching";
14470
+ });
14471
+ if (hasAnyIncompleteItem) if (!hasCachedItemsInState) status = "loading";
14472
+ else status = showPartialAsRefetching ? "refetching" : "loading";
14473
+ else if (hasAnyStaleItem || hasAnyFieldInvalidation) status = "refetching";
14256
14474
  }
14257
14475
  if (partialResources && showPartialAsRefetching) {
14258
14476
  if (Array.isArray(fields) && fields.length > 0) {
14259
- const pendingRequestedFields = fields.filter((field) => status === "loading" && effectiveQuery.query.items.length === 0 ? true : effectiveQuery.query.items.some((itemKey) => {
14260
- return !(state.itemLoadedFields[itemKey] ?? []).includes(field);
14261
- }));
14477
+ const pendingRequestedFields = status === "loading" && effectiveQuery.query.items.length === 0 ? [...fields] : fields.filter((field) => staleOrMissingRequestedFields?.has(field) ?? false);
14262
14478
  if (pendingRequestedFields.length > 0) loadingFields = pendingRequestedFields;
14263
14479
  } else if (fields === "*") {
14264
- const pendingInvalidationFields = Array.from(new Set(effectiveQuery.query.items.flatMap((itemKey) => state.itemFieldInvalidationFields[itemKey] ?? []))).sort();
14480
+ const pendingInvalidationFields = hasAnyIncompleteItem || hasAnyStaleItem ? [] : Array.from(new Set(effectiveQuery.query.items.flatMap((itemKey) => state.itemFieldInvalidationFields[itemKey] ?? []))).sort();
14265
14481
  if (pendingInvalidationFields.length > 0) loadingFields = pendingInvalidationFields;
14266
14482
  }
14267
14483
  }
@@ -14286,8 +14502,10 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14286
14502
  };
14287
14503
  });
14288
14504
  }, [
14505
+ getUnresolvedPendingInvalidationFields,
14289
14506
  getVisibleQueryItemKeys,
14290
14507
  isOfflineMode,
14508
+ itemsPendingFullInvalidation,
14291
14509
  offlineEntitiesByKey,
14292
14510
  partialResources,
14293
14511
  queriesWithId,
@@ -14305,11 +14523,16 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14305
14523
  if (fallbackQuery && readFallbackItemState) {
14306
14524
  const visibleItemKeys = getVisibleQueryItemKeys(result.queryKey, fallbackQuery.items);
14307
14525
  const requestedFields = Array.isArray(queryConfig.fields) ? queryConfig.fields : void 0;
14526
+ const requiresFullItems = queryConfig.fields === "*";
14308
14527
  const fallbackItemStatesByKey = /* @__PURE__ */ new Map();
14309
14528
  for (const itemKey of visibleItemKeys) {
14310
14529
  const fallbackItemState = readFallbackItemState(itemKey);
14311
14530
  fallbackItemStatesByKey.set(itemKey, fallbackItemState);
14312
- if (requestedFields && partialResources && !fallbackItemHasRequestedFields(fallbackItemState, requestedFields)) return result;
14531
+ if (partialResources) {
14532
+ if (requiresFullItems) {
14533
+ if (!snapshotIsFullyLoaded(fallbackItemState?.loadedFields, fallbackItemState?.item, partialResources.inferFields)) return result;
14534
+ } else if (requestedFields && !fallbackItemHasRequestedFields(fallbackItemState, requestedFields, partialResources.inferFields)) return result;
14535
+ }
14313
14536
  }
14314
14537
  const fallbackItems = selectVisibleItems(visibleItemKeys, queryConfig.fields, (itemKey) => {
14315
14538
  const fallbackItemState = fallbackItemStatesByKey.get(itemKey);
@@ -14366,7 +14589,7 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14366
14589
  const unresolvedFields = Array.from(new Set(effectiveQuery.query.items.flatMap((itemKey) => getUnresolvedPendingInvalidationFields(itemKey, state)))).sort();
14367
14590
  const requestedFields = Array.isArray(queryConfig.fields) ? queryConfig.fields : void 0;
14368
14591
  const missingRequestedFields = requestedFields && requestedFields.length > 0 ? effectiveQuery.query.items.flatMap((itemKey) => {
14369
- return excludeLoadedFields(state.itemLoadedFields[itemKey], requestedFields);
14592
+ return getStaleOrMissingRequestedFields(itemKey, state.itemLoadedFields[itemKey], state.items[itemKey], requestedFields, partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey, state));
14370
14593
  }).filter((field, index, array) => array.indexOf(field) === index).sort() : [];
14371
14594
  let unresolvedInvalidationFieldsKey = "";
14372
14595
  if (queryConfig.fields === "*") unresolvedInvalidationFieldsKey = JSON.stringify(unresolvedFields);
@@ -14385,6 +14608,7 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14385
14608
  }, [
14386
14609
  getHighestPendingInvalidationPriority,
14387
14610
  getUnresolvedPendingInvalidationFields,
14611
+ itemsPendingFullInvalidation,
14388
14612
  partialResources,
14389
14613
  queriesWithId,
14390
14614
  resolveEffectiveQuery
@@ -14473,10 +14697,7 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14473
14697
  if (partialResources && !shouldFetch && effectiveQueryState) {
14474
14698
  const isQueryFetchInFlight = effectiveQueryState.status === "loading" || effectiveQueryState.status === "refetching" || effectiveQueryState.status === "loadingMore";
14475
14699
  if (Array.isArray(fields) && fields.length > 0) {
14476
- if (effectiveQueryState.items.some((itemKey) => {
14477
- const loadedFields = store.state.itemLoadedFields[itemKey] ?? [];
14478
- return fields.some((field) => !loadedFields.includes(field));
14479
- }) && !isQueryFetchInFlight) {
14700
+ if (effectiveQueryState.items.some((itemKey) => getStaleOrMissingRequestedFields(itemKey, store.state.itemLoadedFields[itemKey], store.state.items[itemKey], fields, partialResources.inferFields, itemsPendingFullInvalidation, getUnresolvedPendingInvalidationFields(itemKey)).length > 0) && !isQueryFetchInFlight) {
14480
14701
  shouldFetch = true;
14481
14702
  requiredFetch = true;
14482
14703
  fieldsToFetch = fields;
@@ -14493,9 +14714,11 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14493
14714
  if (invalidationPriority && fetchTypePriority[invalidationPriority] > fetchTypePriority[fetchType]) fetchType = invalidationPriority;
14494
14715
  }
14495
14716
  } else if (fields === "*") {
14496
- if (effectiveQueryState.items.some((itemKey) => {
14717
+ const hasAnyPartialItem = effectiveQueryState.items.some((itemKey) => !snapshotIsFullyLoadedAndFresh(itemKey, store.state.itemLoadedFields[itemKey], store.state.items[itemKey], partialResources.inferFields, itemsPendingFullInvalidation));
14718
+ const hasAnyFieldInvalidation = effectiveQueryState.items.some((itemKey) => {
14497
14719
  return getUnresolvedPendingInvalidationFields(itemKey).length > 0;
14498
- }) && !isQueryFetchInFlight) {
14720
+ });
14721
+ if ((hasAnyPartialItem || hasAnyFieldInvalidation) && !isQueryFetchInFlight) {
14499
14722
  shouldFetch = true;
14500
14723
  requiredFetch = true;
14501
14724
  const invalidationPriority = getHighestPendingInvalidationPriority(effectiveQueryState.items, void 0);
@@ -14531,6 +14754,7 @@ function useMultipleListQueries(queries, { itemSelector, returnIdleStatus: allIt
14531
14754
  automaticRetryState,
14532
14755
  itemFieldInvalidationPriorities,
14533
14756
  itemPendingInvalidationFields,
14757
+ itemsPendingFullInvalidation,
14534
14758
  getHighestPendingInvalidationPriority,
14535
14759
  getUnresolvedPendingInvalidationFields,
14536
14760
  stickyDerivedQueryKeys
@@ -14855,7 +15079,7 @@ function createListQueryStore(storeOptions) {
14855
15079
  itemKey,
14856
15080
  item: store.state.items[itemKey] ?? null,
14857
15081
  itemQuery: store.state.itemQueries[itemKey] ?? null,
14858
- loadedFields: store.state.itemLoadedFields[itemKey] ?? []
15082
+ loadedFields: store.state.itemLoadedFields[itemKey]
14859
15083
  }));
14860
15084
  }
14861
15085
  function publishQuerySnapshot(queryKey, consistency = currentBroadcastConsistency) {
@@ -14882,7 +15106,7 @@ function createListQueryStore(storeOptions) {
14882
15106
  consistency,
14883
15107
  item: store.state.items[itemKey] ?? null,
14884
15108
  itemQuery: store.state.itemQueries[itemKey] ?? null,
14885
- loadedFields: store.state.itemLoadedFields[itemKey] ?? []
15109
+ loadedFields: store.state.itemLoadedFields[itemKey]
14886
15110
  });
14887
15111
  if (!message) return;
14888
15112
  recordItemSyncVersion(itemKey, message, consistency);
@@ -14938,6 +15162,8 @@ function createListQueryStore(storeOptions) {
14938
15162
  preloaded: results[index] ?? false
14939
15163
  }));
14940
15164
  }
15165
+ const itemPendingInvalidationFields = /* @__PURE__ */ new Map();
15166
+ const itemsPendingFullInvalidation = /* @__PURE__ */ new Set();
14941
15167
  const { getQueryState, getQueriesKeyArray, getQueriesState, getQueriesRelatedToItem, getItemsKeyArray, getItemState, scheduleListQueryFetch, loadMore, awaitListQueryFetch, getQueryFromStateOrFetch, scheduleItemFetch, awaitItemFetch, getItemFromStateOrFetch, getOrCreateQueryScheduler, getOrCreateItemScheduler, getKnownQueryScheduler, getKnownItemScheduler, syncRemoteFetchStart, syncRemoteFetchSuccess, deleteQueryFetchResources, deleteItemFetchResources, resetSchedulers } = createFetchApi(store, normalizedFetchListFn, offsetPagination, fetchItemFn, batchFetchItemFn, getItemsBatchKey, errorNormalizer, partialResources, lowPriorityThrottleMs, getCoalescingWindowMs, mediumPriorityDelayMs, wrappedDynamicRealtimeThrottleMs, onSchedulerEvent, usesRealTimeUpdates, defaultQuerySize, maxItemBatchSize, getQueryKey, getItemKey, normalizeFieldsOption, !!persistence && !persistence.hasAsyncPreload, persistence ? (queryKeys) => persistence.preloadQueries(queryKeys) : void 0, persistence ? (itemKeys) => persistence.preloadItems(itemKeys) : void 0, persistence, testOptions?.initialLastFetchStartTime, (requests, startedAt) => {
14942
15168
  const queryKey = requests[0]?.requestId;
14943
15169
  if (!queryKey) return;
@@ -14999,12 +15225,12 @@ function createListQueryStore(storeOptions) {
14999
15225
  });
15000
15226
  for (const { itemKey } of successfulItems) publishItemSnapshot(itemKey, "confirmed");
15001
15227
  }
15002
- }, offlineFetchController);
15003
- const { storeEvents, queryInvalidationWasTriggered, itemInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, invalidateQueryAndItems, invalidateItem, startItemMutation, updateItemState: updateItemStateBase, addItemToState: addItemToStateBase, deleteItemState: deleteItemStateBase, resetInvalidationTracking, performMutation: performMutationBase } = createMutationApi(store, fetchItemFn, partialResources, optimisticListUpdates, onInvalidateQuery, onInvalidateItem, resolvedOnMutationError, errorNormalizer, getItemKey, getQueriesKeyArray, getQueriesRelatedToItem, getItemsKeyArray, getOrCreateItemScheduler, getOrCreateQueryScheduler, deleteItemFetchResources, (event) => {
15228
+ }, offlineFetchController, itemPendingInvalidationFields, itemsPendingFullInvalidation);
15229
+ const { storeEvents, queryInvalidationWasTriggered, itemInvalidationWasTriggered, itemFieldInvalidationPriorities, invalidateQueryAndItems, invalidateItem, startItemMutation, updateItemState: updateItemStateBase, addItemToState: addItemToStateBase, deleteItemState: deleteItemStateBase, resetInvalidationTracking, performMutation: performMutationBase } = createMutationApi(store, fetchItemFn, partialResources, optimisticListUpdates, onInvalidateQuery, onInvalidateItem, resolvedOnMutationError, errorNormalizer, getItemKey, getQueriesKeyArray, getQueriesRelatedToItem, getItemsKeyArray, getOrCreateItemScheduler, getOrCreateQueryScheduler, deleteItemFetchResources, (event) => {
15004
15230
  events.emit("invalidateQuery", event);
15005
15231
  }, (event) => {
15006
15232
  events.emit("invalidateItem", event);
15007
- }, blockWindowClose, resolvedOfflineConfig ? offlineMutationController : null, runWithBroadcastConsistency, publishQuerySnapshot, publishItemSnapshot, void 0);
15233
+ }, blockWindowClose, resolvedOfflineConfig ? offlineMutationController : null, runWithBroadcastConsistency, publishQuerySnapshot, publishItemSnapshot, void 0, itemPendingInvalidationFields, itemsPendingFullInvalidation);
15008
15234
  if (resolvedPersistentStorageConfig && resolvedOfflineConfig) offlineController = createOfflineStoreController(id, "listQuery", getSessionKeyForRuntime, resolvedPersistentStorageConfig.onPersistentStorageError, import.meta.env.DEV ? storeManager.debugLogger : void 0, resolvedPersistentStorageConfig.adapter, {
15009
15235
  normalizeEntityRefs: (entityRefs) => entityRefs.map((ref) => {
15010
15236
  const normalizedRef = offlineItemEntityRefSchema.parse(ref).unwrapOrNull();
@@ -15075,10 +15301,12 @@ function createListQueryStore(storeOptions) {
15075
15301
  }
15076
15302
  }, resolvedOfflineConfig.session, __LEGIT_CAST__(offlineOperationsForRuntime));
15077
15303
  function applyLoadedFieldsFromSnapshot(draft, itemKey, loadedFields) {
15078
- if (loadedFields.length > 0) {
15079
- const existingLoadedFields = draft.itemLoadedFields[itemKey] ?? [];
15080
- draft.itemLoadedFields[itemKey] = Array.from(new Set([...existingLoadedFields, ...loadedFields])).sort();
15081
- } else delete draft.itemLoadedFields[itemKey];
15304
+ if (loadedFields === void 0) return;
15305
+ if (loadedFields === "*") draft.itemLoadedFields[itemKey] = "*";
15306
+ else if (loadedFields.length > 0) {
15307
+ const existingLoadedFields = draft.itemLoadedFields[itemKey];
15308
+ if (existingLoadedFields !== "*") draft.itemLoadedFields[itemKey] = Array.from(new Set([...existingLoadedFields ?? [], ...loadedFields])).sort();
15309
+ } else if (draft.itemLoadedFields[itemKey] === void 0) draft.itemLoadedFields[itemKey] = [];
15082
15310
  const invalidationFields = draft.itemFieldInvalidationFields[itemKey];
15083
15311
  if (!invalidationFields) return;
15084
15312
  const remainingFields = excludeLoadedFields(loadedFields, invalidationFields);
@@ -15088,18 +15316,27 @@ function createListQueryStore(storeOptions) {
15088
15316
  function pruneItemInvalidationTracking() {
15089
15317
  for (const [itemKey, pendingFields] of itemPendingInvalidationFields) {
15090
15318
  const remainingFields = excludeLoadedFields(store.state.itemLoadedFields[itemKey], pendingFields);
15319
+ const stateInvalidationFields = store.state.itemFieldInvalidationFields[itemKey];
15320
+ if (stateInvalidationFields && stateInvalidationFields.length > 0) {
15321
+ const mergedFields = Array.from(new Set([...stateInvalidationFields, ...remainingFields])).sort();
15322
+ itemPendingInvalidationFields.set(itemKey, mergedFields);
15323
+ continue;
15324
+ }
15091
15325
  if (remainingFields.length > 0) itemPendingInvalidationFields.set(itemKey, remainingFields);
15092
15326
  else itemPendingInvalidationFields.delete(itemKey);
15093
15327
  }
15328
+ for (const itemKey of itemsPendingFullInvalidation) if (store.state.itemLoadedFields[itemKey] === "*") itemsPendingFullInvalidation.delete(itemKey);
15094
15329
  for (const itemKey of itemFieldInvalidationPriorities.keys()) {
15095
15330
  const hasPendingStateInvalidation = !!store.state.itemFieldInvalidationFields[itemKey];
15096
15331
  const hasPendingTrackedInvalidation = (itemPendingInvalidationFields.get(itemKey)?.length ?? 0) > 0;
15097
- if (!hasPendingStateInvalidation && !hasPendingTrackedInvalidation) itemFieldInvalidationPriorities.delete(itemKey);
15332
+ const hasPendingFullInvalidation = itemsPendingFullInvalidation.has(itemKey);
15333
+ if (!hasPendingStateInvalidation && !hasPendingTrackedInvalidation && !hasPendingFullInvalidation) itemFieldInvalidationPriorities.delete(itemKey);
15098
15334
  }
15099
15335
  }
15100
15336
  function cleanupItemStateMetadata(itemKey) {
15101
15337
  itemFieldInvalidationPriorities.delete(itemKey);
15102
15338
  itemPendingInvalidationFields.delete(itemKey);
15339
+ itemsPendingFullInvalidation.delete(itemKey);
15103
15340
  itemInvalidationWasTriggered.delete(itemKey);
15104
15341
  itemCacheRuntime.clear(itemKey);
15105
15342
  }
@@ -15157,18 +15394,20 @@ function createListQueryStore(storeOptions) {
15157
15394
  return partialResources.mergeItems(currentItem ?? void 0, incomingItem);
15158
15395
  }
15159
15396
  function itemSnapshotSatisfiesRequestedFields(item, loadedFields, requestedFields) {
15160
- if (!partialResources || !requestedFields || requestedFields.length === 0) return true;
15397
+ if (!partialResources) return true;
15161
15398
  if (item === null) return true;
15399
+ if (loadedFields !== void 0 && loadedFields !== "*" && loadedFields.length === 0) return false;
15400
+ if (!requestedFields || requestedFields.length === 0) return snapshotIsFullyLoaded(loadedFields, item, partialResources.inferFields);
15162
15401
  return fallbackItemHasRequestedFields({
15163
15402
  item,
15164
15403
  loadedFields
15165
- }, requestedFields);
15404
+ }, requestedFields, partialResources.inferFields);
15166
15405
  }
15167
15406
  function querySnapshotSatisfiesPendingQueryFetch(message, snapshotItemsByKey, request) {
15168
15407
  const requestedEnd = request.payload.offset + request.payload.limit;
15169
15408
  if (message.query.items.length < requestedEnd && message.query.hasMore) return false;
15170
15409
  const requestedFields = request.payload.fields;
15171
- if (!partialResources || !requestedFields || requestedFields.length === 0) return true;
15410
+ if (!partialResources) return true;
15172
15411
  return message.query.items.slice(request.payload.offset, requestedEnd).every((itemKey) => {
15173
15412
  const item = snapshotItemsByKey.get(itemKey);
15174
15413
  return !!item && itemSnapshotSatisfiesRequestedFields(item.item, item.loadedFields, requestedFields);
@@ -15188,6 +15427,7 @@ function createListQueryStore(storeOptions) {
15188
15427
  };
15189
15428
  applyLoadedFieldsFromSnapshot(draft, message.itemKey, message.loadedFields);
15190
15429
  if (!message.itemQuery && message.item === null) {
15430
+ delete draft.itemLoadedFields[message.itemKey];
15191
15431
  delete draft.itemFieldInvalidationFields[message.itemKey];
15192
15432
  for (const query of Object.values(draft.queries)) query.items = query.items.filter((itemId) => itemId !== message.itemKey);
15193
15433
  }
@@ -15307,7 +15547,7 @@ function createListQueryStore(storeOptions) {
15307
15547
  return state;
15308
15548
  }, []);
15309
15549
  const offlineOverlays = offlineOverlayStore.useSelectorRC(offlineOverlaysSelector);
15310
- return useMultipleListQueries(queries, options, store, events, getQueryKey, registerActiveQueryRefs, touchQueries, getQueryState, persistence?.readHydratedQuery, persistence ? (payloads) => persistence.maybeHydrateQueries(payloads.map((payload) => getQueryKey(payload))) : void 0, !!persistence && !persistence.hasAsyncPreload, persistence && derivedQueries ? (payloads) => persistence.preloadItemsByDerivedQueryGroup(payloads.map((payload) => derivedQueries.getQueryGroup(payload))) : void 0, persistence?.readHydratedItem, scheduleAutomaticListQueryFetch, queryInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, globalDisableRefetchOnMount, partialResources, derivedQueries, isStoreOfflineMode, offlineEntities, offlineOverlays);
15550
+ return useMultipleListQueries(queries, options, store, events, getQueryKey, registerActiveQueryRefs, touchQueries, getQueryState, persistence?.readHydratedQuery, persistence ? (payloads) => persistence.maybeHydrateQueries(payloads.map((payload) => getQueryKey(payload))) : void 0, !!persistence && !persistence.hasAsyncPreload, persistence && derivedQueries ? (payloads) => persistence.preloadItemsByDerivedQueryGroup(payloads.map((payload) => derivedQueries.getQueryGroup(payload))) : void 0, persistence?.readHydratedItem, scheduleAutomaticListQueryFetch, queryInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, itemsPendingFullInvalidation, globalDisableRefetchOnMount, partialResources, derivedQueries, isStoreOfflineMode, offlineEntities, offlineOverlays);
15311
15551
  };
15312
15552
  const useListQuery$2 = function useListQuery$1(payload, options = {}) {
15313
15553
  return useListQuery(payload, options, store, getQueryKey, scheduleListQueryFetch, useMultipleListQueries$2);
@@ -15322,7 +15562,7 @@ function createListQueryStore(storeOptions) {
15322
15562
  return state;
15323
15563
  }, []);
15324
15564
  const offlineOverlays = offlineOverlayStore.useSelectorRC(offlineOverlaysSelector);
15325
- return useMultipleItems(items, options, store, events, getItemKey, registerActiveStandaloneItems, touchItems, scheduleAutomaticItemFetch, persistence ? (payloads) => persistence.maybeHydrateItems(payloads.map((payload) => getItemKey(payload))) : void 0, !!persistence && !persistence.hasAsyncPreload, persistence?.readHydratedItem, itemInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, globalDisableRefetchOnMount, fetchItemFn, partialResources, offlineEntities, offlineOverlays);
15565
+ return useMultipleItems(items, options, store, events, getItemKey, registerActiveStandaloneItems, touchItems, scheduleAutomaticItemFetch, persistence ? (payloads) => persistence.maybeHydrateItems(payloads.map((payload) => getItemKey(payload))) : void 0, !!persistence && !persistence.hasAsyncPreload, persistence?.readHydratedItem, itemInvalidationWasTriggered, itemFieldInvalidationPriorities, itemPendingInvalidationFields, itemsPendingFullInvalidation, globalDisableRefetchOnMount, fetchItemFn, partialResources, offlineEntities, offlineOverlays);
15326
15566
  };
15327
15567
  const useItem$3 = function useItem$2(itemPayload, options = {}) {
15328
15568
  return useItem(itemPayload, options, store, scheduleItemFetch, useMultipleItems$3);