@oxyhq/services 30.0.0 → 30.1.0

package/lib/commonjs/ui/hooks/queries/userCache.js

@@ -0,0 +1,440 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CLEARABLE_USER_FIELDS = void 0;
+exports.clearedFieldsFromAccountUpdate = clearedFieldsFromAccountUpdate;
+exports.clearedFieldsFromProfileUpdate = clearedFieldsFromProfileUpdate;
+exports.upsertCachedUser = upsertCachedUser;
+exports.upsertCachedUsers = upsertCachedUsers;
+var _authStore = require("../../stores/authStore.js");
+var _queryKeys = require("./queryKeys.js");
+/**
+ * Canonical user-cache UPSERT for the Oxy React Query cache.
+ *
+ * The problem this solves: many places across an app write a user object into
+ * the React Query cache and REPLACE the existing entry — profile fetch, feed /
+ * post hydration, search, notifications, lists. Each of those sources carries a
+ * DIFFERENT (often sparse) slice of the user: a feed author has no viewer
+ * `relationship`, a search hit has no `createdAt`, a notification actor has no
+ * `_count`. A plain `setQueryData(key, sparseUser)` therefore STRIPS whatever
+ * fields the authoritative single-profile fetch had already stored — the
+ * "Follows you tag vanishes when the feed loads" / "counts flash to zero" class
+ * of bug.
+ *
+ * The fix (owned here, in the SDK): ONE canonical upsert that MERGES. It writes
+ * under BOTH keys the SDK's user hooks read from:
+ *   - by-id:       `queryKeys.users.detail(id)`             (read by `useUserById`)
+ *   - by-username: `queryKeys.users.byUsername(username, viewerId)` (viewer-scoped;
+ *                  read by `useUserByUsername`, carries the viewer `relationship`)
+ *
+ * Merge semantics (per key):
+ *   - No existing entry  -> seed the (normalized) incoming object and mark it
+ *     STALE (`updatedAt: 0`) so react-query refetches the full authoritative
+ *     profile (viewer-relative `relationship`, counts, `createdAt`, …). Instant
+ *     first paint, then the real fetch.
+ *   - Existing entry     -> `{ ...existing, ...pickMeaningful(incoming) }`: only
+ *     the DEFINED, non-empty fields of `incoming` win; every other field is kept
+ *     from `existing`. A sparse source can never NULL-out or STRIP a field the
+ *     authoritative fetch set. The entry's freshness is left untouched (never
+ *     marked stale — it is already managed).
+ *   - Nested objects (`name`, `_count`, `relationship`) merge field-by-field, so
+ *     a partial `name`/`_count`/`relationship` never replaces a fuller one.
+ *   - `relationship` is written ONLY under the viewer-scoped by-username key —
+ *     the viewer-independent by-id key never stores it (prevents one viewer's
+ *     follow state from leaking into every other viewer's identity cache).
+ *   - Anti-degradation: a good `username` / `name.displayName` / `avatar` is
+ *     never overwritten by a degraded/empty one (empty username, the
+ *     `'Unknown user'` ghost-author sentinel, `null` avatar).
+ *
+ * EXPRESSING A DELIBERATE CLEAR ("remove my picture")
+ * ---------------------------------------------------
+ * The anti-degradation rule above is right for a sparse source and wrong for a
+ * user who just emptied the field — and the two are NOT distinguishable from the
+ * payload. Measured against oxy-api's canonical serializer (`formatUserResponse`
+ * in `packages/api/src/utils/userTransform.ts`, which passes every field through
+ * `typeof value === 'string' ? value : undefined`): an account whose avatar,
+ * bio and display name were all just CLEARED serializes to
+ * `{"id":…,"publicKey":…,"username":…,"name":{},"languages":[]}` — byte-identical
+ * to the same account read as a sparse projection. There is no `null` and no
+ * `''` on the wire to key on. The information that a field was deliberately
+ * emptied exists ONLY at the call site that performed the write.
+ *
+ * So the caller declares it: `upsertCachedUser(qc, user, viewerId, { cleared:
+ * ['avatar'] })`. For a declared field an incoming EMPTY value means the field
+ * IS empty and the stale value is dropped; a MEANINGFUL incoming value still
+ * wins as usual (so `{ cleared: ['name.displayName'] }` on a personal account,
+ * where clearing the explicit name makes the server return the COMPOSED one,
+ * keeps the composed name rather than blanking it).
+ *
+ * A blanket "this source is authoritative, treat every absent field as cleared"
+ * flag was considered and rejected: because the two payloads are byte-identical,
+ * such a flag is an unverifiable promise about provenance, and the failure mode
+ * of getting it wrong is blanking real identity data in every Oxy app. Naming
+ * the fields states something the caller actually observed — which fields the
+ * user emptied — and bounds the damage to exactly those.
+ *
+ * It is a cache write only — zero network, one `setQueryData` per key.
+ */
+
+/**
+ * A user-shaped object that can be upserted into the cache. Intentionally
+ * permissive: it covers the SDK `User` PLUS the looser actor objects embedded on
+ * posts / notifications / lists, where `name` may be a plain string and the id
+ * may arrive as Mongo `_id`. Every field is optional — a sparse feed author is a
+ * valid `CacheableUser`. The index signature lets any additional `User` field
+ * pass through untouched (so the upsert never has to know the full DTO shape).
+ */
+
+/** The degraded display-name sentinel (ghost-author rule). */
+const DEGRADED_DISPLAY_NAME = "Unknown user";
+
+/**
+ * The profile fields a user can genuinely EMPTY through a real Oxy write, and
+ * for which "empty" is a state every renderer already handles.
+ *
+ * Deliberately a closed list rather than "any field": a clear DELETES data from
+ * the cache, so the blast radius of a mistaken declaration is bounded here
+ * instead of resting on each call site. `username` is absent because an account
+ * always has one; `_count` and `relationship` are absent because they are
+ * server-derived, never user-emptied — and dropping a viewer `relationship` is
+ * the exact "Follows you vanishes" bug this module exists to prevent.
+ *
+ * Each entry is clearable through a shipped write path: `avatar`, `bio`,
+ * `description` and `name.displayName` via `UserProfileUpdate` (`''` clears) and
+ * `UpdateAccountInput` (`null` clears avatar/bio; `accountCategories: []`
+ * clears the ordered category list), and `color` via its nullable field.
+ */
+const CLEARABLE_USER_FIELDS = exports.CLEARABLE_USER_FIELDS = ["avatar", "bio", "description", "color", "accountCategories", "name.displayName"];
+
+/** A field nameable in {@link UpsertCachedUserOptions.cleared}. */
+
+/**
+ * Fields the caller deliberately emptied in a `PUT /users/me` patch. The wire
+ * response omits cleared scalars, so the cache needs this list to drop stale
+ * values immediately instead of waiting for a refetch that merges the same
+ * sparse payload.
+ */
+function clearedFieldsFromProfileUpdate(updates) {
+  const cleared = [];
+  if ("avatar" in updates && !isMeaningful(updates.avatar)) {
+    cleared.push("avatar");
+  }
+  if ("bio" in updates && !isMeaningful(updates.bio)) {
+    cleared.push("bio");
+  }
+  if ("description" in updates && !isMeaningful(updates.description)) {
+    cleared.push("description");
+  }
+  if ("color" in updates && updates.color === null) {
+    cleared.push("color");
+  }
+  if (updates.name !== undefined && "displayName" in updates.name && !isMeaningful(updates.name.displayName)) {
+    cleared.push("name.displayName");
+  }
+  return cleared;
+}
+
+/**
+ * Same contract as {@link clearedFieldsFromProfileUpdate} for managed-account
+ * `PATCH /accounts/:id` writes (`null` clears avatar/bio/category).
+ */
+function clearedFieldsFromAccountUpdate(input) {
+  const cleared = [];
+  if ("avatar" in input && !isMeaningful(input.avatar)) {
+    cleared.push("avatar");
+  }
+  if ("bio" in input && !isMeaningful(input.bio)) {
+    cleared.push("bio");
+  }
+  if ("accountCategories" in input && Array.isArray(input.accountCategories) && input.accountCategories.length === 0) {
+    cleared.push("accountCategories");
+  }
+  if (input.name !== undefined && "displayName" in input.name && !isMeaningful(input.name.displayName)) {
+    cleared.push("name.displayName");
+  }
+  return cleared;
+}
+
+/** Options for {@link upsertCachedUser}. */
+
+/** A cache entry always carries a resolved string `id`. */
+
+/**
+ * Whether a value is "meaningful" — i.e. it should override an existing field.
+ * Drops `undefined` / `null` / empty-or-whitespace strings so a sparse source
+ * can never strip a field. `false`, `0` and other falsy-but-defined values ARE
+ * meaningful (a real `verified: false` or `_count.followers: 0`).
+ */
+function isMeaningful(value) {
+  if (value === undefined || value === null) return false;
+  if (typeof value === "string") return value.trim() !== "";
+  return true;
+}
+
+/** A display name is meaningful only when non-empty AND not the degraded sentinel. */
+function isMeaningfulDisplayName(value) {
+  return typeof value === "string" && value.trim() !== "" && value !== DEGRADED_DISPLAY_NAME;
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+/** Normalize the polymorphic `name` (string | object | nullish) to the canonical object shape. */
+function normalizeName(name) {
+  if (name === undefined || name === null) return undefined;
+  if (typeof name === "string") {
+    const trimmed = name.trim();
+    return trimmed ? {
+      displayName: trimmed
+    } : undefined;
+  }
+  return name;
+}
+
+/**
+ * Coerce a user-shaped object to a cache entry: resolve the id from
+ * `id ?? _id ?? fallbackId` and normalize `name` to the canonical object shape
+ * (the polymorphic `string` name is dropped from the spread and re-set as an
+ * object so the cache never holds a bare-string name).
+ */
+function toCachedUser(user, fallbackId) {
+  const {
+    name: rawName,
+    ...rest
+  } = user;
+  const id = String(user.id ?? user._id ?? fallbackId);
+  const name = normalizeName(rawName);
+  const normalized = {
+    ...rest,
+    id
+  };
+  if (name !== undefined) normalized.name = name;
+  return normalized;
+}
+
+/**
+ * Normalize an incoming (possibly partial) user to a cache entry. Returns `null`
+ * when no id can be resolved (nothing to key on).
+ */
+function normalizeIncoming(user) {
+  const cached = toCachedUser(user, "");
+  return cached.id ? cached : null;
+}
+
+/**
+ * Copy a name WITHOUT its `displayName`. The key must end up ABSENT rather than
+ * present-and-`undefined`: consumers render `name.displayName` directly and fall
+ * back to the handle when it is missing, and a present-but-undefined key also
+ * changes what a later merge sees.
+ */
+function omitDisplayName(name) {
+  const result = {};
+  for (const [key, value] of Object.entries(name)) {
+    if (key !== "displayName") result[key] = value;
+  }
+  return result;
+}
+
+/**
+ * Merge two `name` objects field-by-field, with anti-degradation on
+ * `displayName`.
+ *
+ * `clearDisplayName` is the declared-clear escape hatch: the incoming value
+ * still wins whenever it is meaningful (an account that clears its explicit
+ * display name gets the server-COMPOSED one back, which must not be discarded),
+ * and only a genuinely empty incoming value drops the stored one.
+ *
+ * Both incoming shapes reach the clear, and they are separate branches: the
+ * measured oxy-api response carries `name` as a PRESENT-but-empty object, while
+ * a caller passing a bare user object may carry no `name` key at all.
+ */
+function mergeName(existing, incoming, clearDisplayName) {
+  if (incoming === undefined) {
+    if (!clearDisplayName || existing === undefined) return existing;
+    return omitDisplayName(existing);
+  }
+  if (existing === undefined) return incoming;
+  const merged = {
+    ...existing
+  };
+  for (const [key, value] of Object.entries(incoming)) {
+    if (key === "displayName") continue;
+    if (isMeaningful(value)) merged[key] = value;
+  }
+  // Never let an empty / `'Unknown user'` displayName overwrite a real one —
+  // unless the caller declared that the user cleared it.
+  if (isMeaningfulDisplayName(incoming.displayName)) {
+    merged.displayName = incoming.displayName;
+    return merged;
+  }
+  return clearDisplayName ? omitDisplayName(merged) : merged;
+}
+
+/** Merge `_count` field-by-field so a partial count never replaces a fuller one. */
+function mergeCount(existing, incoming) {
+  if (!isPlainObject(incoming)) return existing;
+  const merged = {
+    ...(isPlainObject(existing) ? existing : {})
+  };
+  if (typeof incoming.followers === "number") merged.followers = incoming.followers;
+  if (typeof incoming.following === "number") merged.following = incoming.following;
+  return merged;
+}
+
+/**
+ * Merge `relationship`. A source without a relationship (feed/list/notification,
+ * or an anon/self/bulk `null`) must NEVER strip an existing viewer relationship.
+ */
+function mergeRelationship(existing, incoming) {
+  if (!isPlainObject(incoming)) return existing;
+  const merged = {
+    ...(isPlainObject(existing) ? existing : {})
+  };
+  if (typeof incoming.isFollowing === "boolean") merged.isFollowing = incoming.isFollowing;
+  if (typeof incoming.followsYou === "boolean") merged.followsYou = incoming.followsYou;
+  return merged;
+}
+
+/**
+ * Merge a (normalized) incoming user over an existing cache entry: keep every
+ * existing field, override only with the meaningful fields of `incoming`.
+ *
+ * When `includeRelationship` is false (the viewer-independent by-id key), the
+ * viewer-relative `relationship` field is never read, written, or preserved —
+ * only the by-username key carries it (`useUserByUsername`).
+ *
+ * `cleared` names the fields the write deliberately emptied. It is applied
+ * AFTER the merge, because the merge loop can only ever COPY a meaningful value
+ * — an emptied field is absent from `incoming` (see the module docs: oxy-api
+ * omits it entirely) and would otherwise survive from `existing` untouched.
+ */
+function mergeUsers(existing, incoming, options) {
+  const includeRelationship = options?.includeRelationship ?? true;
+  const cleared = options?.cleared;
+  const merged = {
+    ...existing
+  };
+  for (const [key, value] of Object.entries(incoming)) {
+    if (key === "name" || key === "_count" || key === "relationship") continue;
+    if (key === "id") {
+      merged.id = incoming.id;
+      continue;
+    }
+    if (isMeaningful(value)) merged[key] = value;
+  }
+  const name = mergeName(existing.name, incoming.name, cleared?.includes("name.displayName") ?? false);
+  if (name !== undefined) merged.name = name;
+  const count = mergeCount(existing._count, incoming._count);
+  if (count !== undefined) merged._count = count;
+  if (includeRelationship) {
+    const relationship = mergeRelationship(existing.relationship, incoming.relationship);
+    if (relationship !== undefined) merged.relationship = relationship;
+  } else {
+    merged.relationship = undefined;
+  }
+  if (cleared) {
+    for (const field of cleared) {
+      if (field === "name.displayName") continue; // handled by `mergeName`.
+      if (!isMeaningful(incoming[field])) delete merged[field];
+    }
+  }
+  return merged;
+}
+
+/** Merge-upsert a normalized user into one cache key (see module docs for semantics). */
+function upsertOneKey(queryClient, key, incoming, options) {
+  const mergeOpts = {
+    includeRelationship: options.includeRelationship,
+    cleared: options.cleared
+  };
+  const existing = queryClient.getQueryData(key);
+  if (existing === undefined) {
+    // Cold slot: seed the full incoming object, STALE, so react-query refetches
+    // the full authoritative profile (relationship, counts, createdAt, …).
+    const seeded = mergeUsers({
+      id: incoming.id
+    }, incoming, mergeOpts);
+    queryClient.setQueryData(key, seeded, {
+      updatedAt: 0
+    });
+    return;
+  }
+  // Existing entry: merge and leave its freshness lifecycle untouched. The
+  // existing entry is keyed by `incoming.id`, so use it as the fallback id.
+  const merged = mergeUsers(toCachedUser(existing, incoming.id), incoming, mergeOpts);
+  const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
+  queryClient.setQueryData(key, merged, {
+    updatedAt: dataUpdatedAt
+  });
+}
+
+/**
+ * Resolve the active viewer id. The by-username cache key is viewer-scoped; the
+ * seed must land on the exact key `useUserByUsername` reads. When a caller does
+ * not pass `viewerId`, read it from the auth store — the same store behind the
+ * hook's `useOxy().user?.id`, so seed and read stay in lockstep. An explicit
+ * empty string is honoured (anonymous scope).
+ */
+function resolveViewerId(viewerId) {
+  return viewerId ?? _authStore.useAuthStore.getState().user?.id ?? "";
+}
+
+/**
+ * Merge-upsert a (possibly partial) user into the SDK's user query cache under
+ * both the by-id key and, when a username is present, the viewer-scoped
+ * by-username key.
+ *
+ * @param queryClient The app's React Query client.
+ * @param user        A `User`-shaped object (may be sparse).
+ * @param viewerId    The active viewer id for the by-username key. Defaults to
+ *                    the current auth-store user id.
+ * @param options     `cleared` names the fields the write deliberately emptied
+ *                    — the ONLY way "remove my picture" can propagate, since a
+ *                    cleared field and an uncarried one are byte-identical on
+ *                    the wire (see the module docs).
+ */
+function upsertCachedUser(queryClient, user, viewerId, options) {
+  const incoming = normalizeIncoming(user);
+  if (!incoming) return;
+  const cleared = options?.cleared;
+
+  // By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
+  // the viewer-relative `relationship` here or one viewer's follow state leaks
+  // into every other viewer's by-id cache entry.
+  upsertOneKey(queryClient, _queryKeys.queryKeys.users.detail(incoming.id), incoming, {
+    includeRelationship: false,
+    cleared
+  });
+  const username = incoming.username;
+  if (typeof username === "string" && username.trim() !== "") {
+    // By-username entry (read by `useUserByUsername`). Viewer-scoped because the
+    // authenticated single-profile fetch embeds the viewer `relationship`. Build
+    // the key through the SAME helper the hook uses so username normalization
+    // (`trim().toLowerCase()`) matches byte-for-byte.
+    const key = _queryKeys.queryKeys.users.byUsername(username, resolveViewerId(viewerId));
+    upsertOneKey(queryClient, key, incoming, {
+      includeRelationship: true,
+      cleared
+    });
+  }
+}
+
+/**
+ * Batch merge-upsert many users at once (for a feed / list / search response).
+ * Resolves the viewer id once and upserts each user cumulatively — a user that
+ * appears twice merges both slices into the single cache entry.
+ *
+ * Takes NO `cleared`, deliberately: a batch is a multi-user projection, so it is
+ * exactly the sparse source the anti-degradation guard exists for, and one
+ * declaration could not be true of every user in the array anyway.
+ */
+function upsertCachedUsers(queryClient, users, viewerId) {
+  if (!Array.isArray(users) || users.length === 0) return;
+  const resolvedViewerId = resolveViewerId(viewerId);
+  for (const user of users) {
+    if (user) upsertCachedUser(queryClient, user, resolvedViewerId);
+  }
+}
+//# sourceMappingURL=userCache.js.map

package/lib/commonjs/ui/hooks/queries/userCache.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_authStore","require","_queryKeys","DEGRADED_DISPLAY_NAME","CLEARABLE_USER_FIELDS","exports","clearedFieldsFromProfileUpdate","updates","cleared","isMeaningful","avatar","push","bio","description","color","name","undefined","displayName","clearedFieldsFromAccountUpdate","input","Array","isArray","accountCategories","length","value","trim","isMeaningfulDisplayName","isPlainObject","normalizeName","trimmed","toCachedUser","user","fallbackId","rawName","rest","id","String","_id","normalized","normalizeIncoming","cached","omitDisplayName","result","key","Object","entries","mergeName","existing","incoming","clearDisplayName","merged","mergeCount","followers","following","mergeRelationship","isFollowing","followsYou","mergeUsers","options","includeRelationship","includes","count","_count","relationship","field","upsertOneKey","queryClient","mergeOpts","getQueryData","seeded","setQueryData","updatedAt","dataUpdatedAt","getQueryState","resolveViewerId","viewerId","useAuthStore","getState","upsertCachedUser","queryKeys","users","detail","username","byUsername","upsertCachedUsers","resolvedViewerId"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/userCache.ts"],"mappings":";;;;;;;;;;AAuEA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAxEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAwBA;AACA,MAAME,qBAAqB,GAAG,cAAc;;AAE5C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,qBAAqB,GAAAC,OAAA,CAAAD,qBAAA,GAAG,CACpC,QAAQ,EACR,KAAK,EACL,aAAa,EACb,OAAO,EACP,mBAAmB,EACnB,kBAAkB,CACT;;AAEV;;AAGA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,8BAA8BA,CAC7CC,OAA0B,EACH;EACvB,MAAMC,OAA6B,GAAG,EAAE;EACxC,IAAI,QAAQ,IAAID,OAAO,IAAI,CAACE,YAAY,CAACF,OAAO,CAACG,MAAM,CAAC,EAAE;IACzDF,OAAO,CAACG,IAAI,CAAC,QAAQ,CAAC;EACvB;EACA,IAAI,KAAK,IAAIJ,OAAO,IAAI,CAACE,YAAY,CAACF,OAAO,CAACK,GAAG,CAAC,EAAE;IACnDJ,OAAO,CAACG,IAAI,CAAC,KAAK,CAAC;EACpB;EACA,IAAI,aAAa,IAAIJ,OAAO,IAAI,CAACE,YAAY,CAACF,OAAO,CAACM,WAAW,CAAC,EAAE;IACnEL,OAAO,CAACG,IAAI,CAAC,aAAa,CAAC;EAC5B;EACA,IAAI,OAAO,IAAIJ,OAAO,IAAIA,OAAO,CAACO,KAAK,KAAK,IAAI,EAAE;IACj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","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/userCacheRelationship.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.patchCachedUserRelationship = patchCachedUserRelationship;
+var _queryKeys = require("./queryKeys.js");
+/**
+ * Patch `relationship.isFollowing` on every cached single-profile entry for
+ * `targetUserId` (by-id and viewer-scoped by-username keys) after a follow
+ * toggle. Lives outside `userCache.ts` so hooks like `useFollow` can import it
+ * without pulling the auth store (which `userCache` uses for viewer defaults).
+ */
+function patchCachedUserRelationship(queryClient, targetUserId, isFollowing) {
+  queryClient.setQueriesData({
+    queryKey: _queryKeys.queryKeys.users.details(),
+    // Viewer-relative `relationship` must never be written on the viewer-
+    // independent by-id key — only viewer-scoped detail / by-username keys.
+    predicate: query => query.queryKey.includes('viewer')
+  }, existing => {
+    if (!existing || existing.id !== targetUserId) return existing;
+    return {
+      ...existing,
+      relationship: {
+        ...existing.relationship,
+        isFollowing
+      }
+    };
+  });
+}
+//# sourceMappingURL=userCacheRelationship.js.map

package/lib/commonjs/ui/hooks/queries/userCacheRelationship.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_queryKeys","require","patchCachedUserRelationship","queryClient","targetUserId","isFollowing","setQueriesData","queryKey","queryKeys","users","details","predicate","query","includes","existing","id","relationship"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/userCacheRelationship.ts"],"mappings":";;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAKA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,2BAA2BA,CACzCC,WAAwB,EACxBC,YAAoB,EACpBC,WAAoB,EACd;EACNF,WAAW,CAACG,cAAc,CACxB;IACEC,QAAQ,EAAEC,oBAAS,CAACC,KAAK,CAACC,OAAO,CAAC,CAAC;IACnC;IACA;IACAC,SAAS,EAAGC,KAAK,IAAMA,KAAK,CAACL,QAAQ,CAAwBM,QAAQ,CAAC,QAAQ;EAChF,CAAC,EACAC,QAAQ,IAAK;IACZ,IAAI,CAACA,QAAQ,IAAIA,QAAQ,CAACC,EAAE,KAAKX,YAAY,EAAE,OAAOU,QAAQ;IAC9D,OAAO;MACL,GAAGA,QAAQ;MACXE,YAAY,EAAE;QAAE,GAAGF,QAAQ,CAACE,YAAY;QAAEX;MAAY;IACxD,CAAC;EACH,CACF,CAAC;AACH","ignoreList":[]}