@atproto/bsky 0.0.230 → 0.0.231

package/dist/hydration/hydrator.js

@@ -1,77 +1,26 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeManyStates = exports.mergeStates = exports.Hydrator = exports.HydrateCtx = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const common_1 = require("@atproto/common");
-const syntax_1 = require("@atproto/syntax");
-const index_js_1 = require("../lexicons/index.js");
-const logger_1 = require("../logger");
-const uris_1 = require("../util/uris");
-const types_js_1 = require("../views/types.js");
-const actor_1 = require("./actor");
-const feed_1 = require("./feed");
-const graph_1 = require("./graph");
-const label_1 = require("./label");
-const util_1 = require("./util");
-class HydrateCtx {
+import assert from 'node:assert';
+import { mapDefined } from '@atproto/common';
+import { AtUri } from '@atproto/syntax';
+import { app, chat, com } from '../lexicons/index.js';
+import { hydrationLogger } from '../logger.js';
+import { uriToDid, uriToDid as didFromUri } from '../util/uris.js';
+import { isListRuleType, isRecordEmbedType, isRecordWithMediaType, } from '../views/types.js';
+import { ActorHydrator, } from './actor.js';
+import { FeedHydrator, } from './feed.js';
+import { GraphHydrator, } from './graph.js';
+import { LabelHydrator, Labels, } from './label.js';
+import { HydrationMap, mergeManyMaps, mergeMaps, mergeNestedMaps, parseDate, urisByCollection, } from './util.js';
+export class HydrateCtx {
     constructor(vals) {
-        Object.defineProperty(this, "vals", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: vals
-        });
-        Object.defineProperty(this, "labelers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.labelers
-        });
-        Object.defineProperty(this, "viewer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null
-        });
-        Object.defineProperty(this, "includeTakedowns", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.includeTakedowns
-        });
-        Object.defineProperty(this, "overrideIncludeTakedownsForActor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.overrideIncludeTakedownsForActor
-        });
-        Object.defineProperty(this, "include3pBlocks", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.include3pBlocks
-        });
-        Object.defineProperty(this, "skipViewerBlocks", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.skipViewerBlocks
-        });
-        Object.defineProperty(this, "includeDebugField", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.includeDebugField
-        });
-        Object.defineProperty(this, "features", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.features
-        });
+        this.vals = vals;
+        this.labelers = this.vals.labelers;
+        this.viewer = this.vals.viewer !== null ? serviceRefToDid(this.vals.viewer) : null;
+        this.includeTakedowns = this.vals.includeTakedowns;
+        this.overrideIncludeTakedownsForActor = this.vals.overrideIncludeTakedownsForActor;
+        this.include3pBlocks = this.vals.include3pBlocks;
+        this.skipViewerBlocks = this.vals.skipViewerBlocks;
+        this.includeDebugField = this.vals.includeDebugField;
+        this.features = this.vals.features;
     }
     // Convenience with use with dataplane.getActors cache control
     get skipCacheForViewer() {
@@ -83,56 +32,14 @@ class HydrateCtx {
         return new HydrateCtx({ ...this.vals, ...vals });
     }
 }
-exports.HydrateCtx = HydrateCtx;
-class Hydrator {
+export class Hydrator {
     constructor(dataplane, serviceLabelers = [], config) {
-        Object.defineProperty(this, "dataplane", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: dataplane
-        });
-        Object.defineProperty(this, "actor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "feed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "graph", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "label", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "serviceLabelers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "config", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.dataplane = dataplane;
         this.config = config;
-        this.actor = new actor_1.ActorHydrator(dataplane);
-        this.feed = new feed_1.FeedHydrator(dataplane);
-        this.graph = new graph_1.GraphHydrator(dataplane);
-        this.label = new label_1.LabelHydrator(dataplane);
+        this.actor = new ActorHydrator(dataplane);
+        this.feed = new FeedHydrator(dataplane);
+        this.graph = new GraphHydrator(dataplane);
+        this.label = new LabelHydrator(dataplane);
         this.serviceLabelers = new Set(serviceLabelers);
     }
     // app.bsky.actor.defs#profileView
@@ -153,7 +60,7 @@ class Hydrator {
         profileViewers.forEach((item) => {
             removeNonModListsFromProfileViewer(item, listState);
         });
-        return (0, exports.mergeStates)(listState, {
+        return mergeStates(listState, {
             profileViewers,
             ctx,
         });
@@ -178,7 +85,7 @@ class Hydrator {
         if (!includeTakedowns) {
             actionTakedownLabels(dids, actors, labels);
         }
-        return (0, exports.mergeStates)(profileViewersState ?? {}, {
+        return mergeStates(profileViewersState ?? {}, {
             actors,
             labels,
             ctx,
@@ -200,19 +107,19 @@ class Hydrator {
     //       - list basic
     //     - labels
     async hydrateProfilesDetailed(dids, ctx) {
-        let knownFollowers = new util_1.HydrationMap();
+        let knownFollowers = new HydrationMap();
         try {
             knownFollowers = await this.actor.getKnownFollowers(dids, ctx.viewer);
         }
         catch (err) {
-            logger_1.hydrationLogger.error({ err }, 'Failed to get known followers for profiles');
+            hydrationLogger.error({ err }, 'Failed to get known followers for profiles');
         }
-        let activitySubscriptions = new util_1.HydrationMap();
+        let activitySubscriptions = new HydrationMap();
         try {
             activitySubscriptions = await this.actor.getActivitySubscriptions(dids, ctx.viewer);
         }
         catch (err) {
-            logger_1.hydrationLogger.error({ err }, 'Failed to get activity subscriptions state for profiles');
+            hydrationLogger.error({ err }, 'Failed to get activity subscriptions state for profiles');
         }
         const subjectsToKnownFollowersMap = new Map();
         for (const did of knownFollowers.keys()) {
@@ -236,7 +143,7 @@ class Hydrator {
             }
         });
         const starterPackState = await this.hydrateStarterPacksBasic([...starterPackUriSet], ctx);
-        return (0, exports.mergeManyStates)(state, starterPackState, {
+        return mergeManyStates(state, starterPackState, {
             profileAggs,
             knownFollowers,
             activitySubscriptions,
@@ -252,14 +159,14 @@ class Hydrator {
             this.hydrateListsBasic(uris, ctx, {
                 skipAuthors: true, // handled via author profile hydration
             }),
-            this.hydrateProfilesBasic(uris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
         ]);
-        return (0, exports.mergeStates)(listsState, profilesState);
+        return mergeStates(listsState, profilesState);
     }
     // app.bsky.graph.defs#listViewBasic
     // - list basic
     async hydrateListsBasic(uris, ctx, opts) {
-        const includeAuthorDids = opts?.skipAuthors ? [] : uris.map(uris_1.uriToDid);
+        const includeAuthorDids = opts?.skipAuthors ? [] : uris.map(uriToDid);
         const [lists, listAggs, listViewers, labels, actors] = await Promise.all([
             this.graph.getLists(uris, ctx.includeTakedowns),
             this.graph.getListAggregates(uris.map((uri) => ({ uri }))),
@@ -289,7 +196,7 @@ class Hydrator {
             }
         });
         const profileState = await this.hydrateProfiles(dids, ctx);
-        return (0, exports.mergeStates)(profileState, { listItems, ctx });
+        return mergeStates(profileState, { listItems, ctx });
     }
     async hydrateListsMembership(uris, did, ctx) {
         const [actorsHydrationState, listsHydrationState, { listitemUris: listItemUris },] = await Promise.all([
@@ -301,18 +208,18 @@ class Hydrator {
             }),
         ]);
         // mapping uri -> did -> { actorListItemUri }
-        const listMemberships = new util_1.HydrationMap(uris.map((uri, i) => {
+        const listMemberships = new HydrationMap(uris.map((uri, i) => {
             const listItemUri = listItemUris[i];
             return [
                 uri,
-                new util_1.HydrationMap([
+                new HydrationMap([
                     listItemUri
                         ? [did, { actorListItemUri: listItemUri }]
                         : [did, null],
                 ]),
             ];
         }));
-        return (0, exports.mergeManyStates)(actorsHydrationState, listsHydrationState, {
+        return mergeManyStates(actorsHydrationState, listsHydrationState, {
             listMemberships,
             ctx,
         });
@@ -332,10 +239,10 @@ class Hydrator {
     //       - list basic
     async hydratePosts(refs, ctx, state = {}, options = {}) {
         const uris = refs.map((ref) => ref.uri);
-        state.posts ?? (state.posts = new util_1.HydrationMap());
+        state.posts ??= new HydrationMap();
         const addPostsToHydrationState = (posts) => {
             posts.forEach((post, uri) => {
-                state.posts ?? (state.posts = new util_1.HydrationMap());
+                state.posts ??= new HydrationMap();
                 state.posts.set(uri, post);
             });
         };
@@ -368,14 +275,14 @@ class Hydrator {
         }
         // layer 1: first level embeds plus thread roots we haven't fetched yet
         const urisLayer1 = nestedRecordUrisFromPosts(postsLayer0);
-        const urisLayer1ByCollection = (0, util_1.urisByCollection)(urisLayer1);
-        const embedPostUrisLayer1 = urisLayer1ByCollection.get(index_js_1.app.bsky.feed.post.$type) ?? [];
+        const urisLayer1ByCollection = urisByCollection(urisLayer1);
+        const embedPostUrisLayer1 = urisLayer1ByCollection.get(app.bsky.feed.post.$type) ?? [];
         const postsLayer1 = await this.feed.getPosts([...embedPostUrisLayer1, ...additionalRootUris], ctx.includeTakedowns, state.posts);
         addPostsToHydrationState(postsLayer1);
         // layer 2: second level embeds, ignoring any additional root uris we mixed-in to the previous layer
         const urisLayer2 = nestedRecordUrisFromPosts(postsLayer1, embedPostUrisLayer1);
-        const urisLayer2ByCollection = (0, util_1.urisByCollection)(urisLayer2);
-        const embedPostUrisLayer2 = urisLayer2ByCollection.get(index_js_1.app.bsky.feed.post.$type) ?? [];
+        const urisLayer2ByCollection = urisByCollection(urisLayer2);
+        const embedPostUrisLayer2 = urisLayer2ByCollection.get(app.bsky.feed.post.$type) ?? [];
         const [postsLayer2, threadgates] = await Promise.all([
             this.feed.getPosts(embedPostUrisLayer2, ctx.includeTakedowns, state.posts),
             this.feed.getThreadgatesForPosts([...postUrisWithThreadgates.values()]),
@@ -384,22 +291,22 @@ class Hydrator {
         // collect list/feedgen embeds, lists in threadgates, post record hydration
         const threadgateListUris = getListUrisFromThreadgates(threadgates);
         const nestedListUris = [
-            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.graph.list.$type) ?? []),
-            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.graph.list.$type) ?? []),
+            ...(urisLayer1ByCollection.get(app.bsky.graph.list.$type) ?? []),
+            ...(urisLayer2ByCollection.get(app.bsky.graph.list.$type) ?? []),
         ];
         const nestedFeedGenUris = [
-            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.feed.generator.$type) ?? []),
-            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.feed.generator.$type) ?? []),
+            ...(urisLayer1ByCollection.get(app.bsky.feed.generator.$type) ?? []),
+            ...(urisLayer2ByCollection.get(app.bsky.feed.generator.$type) ?? []),
         ];
         const nestedLabelerDids = [
-            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.labeler.service.$type) ?? []),
-            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.labeler.service.$type) ?? []),
-        ].map(uris_1.uriToDid);
+            ...(urisLayer1ByCollection.get(app.bsky.labeler.service.$type) ?? []),
+            ...(urisLayer2ByCollection.get(app.bsky.labeler.service.$type) ?? []),
+        ].map(didFromUri);
         const nestedStarterPackUris = [
-            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.graph.starterpack.$type) ?? []),
-            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.graph.starterpack.$type) ?? []),
+            ...(urisLayer1ByCollection.get(app.bsky.graph.starterpack.$type) ?? []),
+            ...(urisLayer2ByCollection.get(app.bsky.graph.starterpack.$type) ?? []),
         ];
-        const posts = (0, util_1.mergeManyMaps)(postsLayer0, postsLayer1, postsLayer2) ?? postsLayer0;
+        const posts = mergeManyMaps(postsLayer0, postsLayer1, postsLayer2) ?? postsLayer0;
         const allPostUris = [...posts.keys()];
         const allRefs = [
             ...refs,
@@ -423,7 +330,7 @@ class Hydrator {
                 : undefined,
             this.label.getLabelsForSubjects(allPostUris, ctx.labelers),
             this.hydratePostBlocks(posts, ctx),
-            this.hydrateProfiles(allPostUris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfiles(allPostUris.map(didFromUri), ctx),
             this.hydrateLists([...nestedListUris, ...threadgateListUris], ctx),
             this.hydrateFeedGens(nestedFeedGenUris, ctx),
             this.hydrateLabelers(nestedLabelerDids, ctx),
@@ -434,7 +341,7 @@ class Hydrator {
             actionTakedownLabels(allPostUris, posts, labels);
         }
         // combine all hydration state
-        return (0, exports.mergeManyStates)(profileState, listState, feedGenState, labelerState, starterPackState, {
+        return mergeManyStates(profileState, listState, feedGenState, labelerState, starterPackState, {
             posts,
             postAggs,
             postViewers,
@@ -446,26 +353,26 @@ class Hydrator {
         });
     }
     async hydratePostBlocks(posts, ctx) {
-        const postBlocks = new util_1.HydrationMap();
+        const postBlocks = new HydrationMap();
         const postBlocksPairs = new Map();
         const relationships = [];
         for (const [uri, item] of posts) {
             if (!item)
                 continue;
             const post = item.record;
-            const creator = (0, uris_1.uriToDid)(uri);
+            const creator = didFromUri(uri);
             const postBlockPairs = {};
             postBlocksPairs.set(uri, postBlockPairs);
             // 3p block for replies
             const parentUri = post.reply?.parent.uri;
-            const parentDid = parentUri && (0, uris_1.uriToDid)(parentUri);
+            const parentDid = parentUri && didFromUri(parentUri);
             if (parentDid && parentDid !== creator) {
                 const pair = [creator, parentDid];
                 relationships.push(pair);
                 postBlockPairs.parent = pair;
             }
             const rootUri = post.reply?.root.uri;
-            const rootDid = rootUri && (0, uris_1.uriToDid)(rootUri);
+            const rootDid = rootUri && didFromUri(rootUri);
             if (rootDid && rootDid !== creator) {
                 const pair = [creator, rootDid];
                 relationships.push(pair);
@@ -473,7 +380,7 @@ class Hydrator {
             }
             // 3p block for record embeds
             for (const embedUri of nestedRecordUris(post)) {
-                const pair = [creator, (0, uris_1.uriToDid)(embedUri)];
+                const pair = [creator, didFromUri(embedUri)];
                 relationships.push(pair);
                 postBlockPairs.embed = pair;
             }
@@ -527,18 +434,18 @@ class Hydrator {
             const parent = replies.get(uri);
             if (!parent?.record.reply)
                 return;
-            replyParentAuthors.push((0, uris_1.uriToDid)(parent.record.reply.parent.uri));
+            replyParentAuthors.push(didFromUri(parent.record.reply.parent.uri));
         });
         // hydrate state for all posts, reposts, authors of reposts + reply parent authors
-        const repostUris = (0, common_1.mapDefined)(items, (item) => item.repost?.uri);
+        const repostUris = mapDefined(items, (item) => item.repost?.uri);
         const [postState, repostProfileState, reposts] = await Promise.all([
             this.hydratePosts(postAndReplyRefs, ctx, {
                 posts: posts.merge(replies), // avoids refetches of posts
             }),
-            this.hydrateProfiles([...repostUris.map(uris_1.uriToDid), ...replyParentAuthors], ctx),
+            this.hydrateProfiles([...repostUris.map(didFromUri), ...replyParentAuthors], ctx),
             this.feed.getReposts(repostUris, ctx.includeTakedowns),
         ]);
-        return (0, exports.mergeManyStates)(postState, repostProfileState, {
+        return mergeManyStates(postState, repostProfileState, {
             reposts,
             ctx,
         });
@@ -572,7 +479,7 @@ class Hydrator {
             }
         }
         const threadContexts = await this.feed.getThreadContexts(threadRefs);
-        return (0, exports.mergeStates)(postsState, { threadContexts });
+        return mergeStates(postsState, { threadContexts });
     }
     // app.bsky.feed.defs#generatorView
     // - feedgen
@@ -586,13 +493,13 @@ class Hydrator {
             ctx.viewer
                 ? this.feed.getFeedGenViewerStates(uris, ctx.viewer)
                 : undefined,
-            this.hydrateProfiles(uris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfiles(uris.map(didFromUri), ctx),
             this.label.getLabelsForSubjects(uris, ctx.labelers),
         ]);
         if (!ctx.includeTakedowns) {
             actionTakedownLabels(uris, feedgens, labels);
         }
-        return (0, exports.mergeStates)(profileState, {
+        return mergeStates(profileState, {
             feedgens,
             feedgenAggs,
             feedgenViewers,
@@ -609,13 +516,13 @@ class Hydrator {
         const [starterPacks, starterPackAggs, profileState, labels] = await Promise.all([
             this.graph.getStarterPacks(uris, ctx.includeTakedowns),
             this.graph.getStarterPackAggregates(uris.map((uri) => ({ uri }))),
-            this.hydrateProfiles(uris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfiles(uris.map(didFromUri), ctx),
             this.label.getLabelsForSubjects(uris, ctx.labelers),
         ]);
         if (!ctx.includeTakedowns) {
             actionTakedownLabels(uris, starterPacks, labels);
         }
-        return (0, exports.mergeStates)(profileState, {
+        return mergeStates(profileState, {
             starterPacks,
             starterPackAggs,
             labels,
@@ -657,7 +564,7 @@ class Hydrator {
         const listMembersByList = new Map(listUris.map((uri, i) => [uri, listsMembers[i]]));
         const listMemberDids = listsMembers.flatMap((lm) => lm.listitems.map((li) => li.did));
         const listCreatorMemberPairs = [...listMembersByList.entries()].flatMap(([listUri, members]) => {
-            const creator = (0, uris_1.uriToDid)(listUri);
+            const creator = didFromUri(listUri);
             return members.listitems.map((li) => [creator, li.did]);
         });
         const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(listCreatorMemberPairs), ctx);
@@ -672,7 +579,7 @@ class Hydrator {
             const members = listMembersByList.get(sp.record.list);
             if (!members)
                 return;
-            const creator = (0, uris_1.uriToDid)(sp.record.list);
+            const creator = didFromUri(sp.record.list);
             // update aggregation with list items for top 12 most followed members
             agg.listItemSampleUris = [
                 ...members.listitems.filter((li) => ctx.viewer === creator ||
@@ -689,7 +596,7 @@ class Hydrator {
         });
         // hydrate sampled list items
         const listItemState = await this.hydrateListItems(listItemUris, ctx);
-        return (0, exports.mergeManyStates)(starterPackState, feedGenState, listState, listItemState);
+        return mergeManyStates(starterPackState, feedGenState, listState, listItemState);
     }
     // app.bsky.feed.getLikes#like
     // - like
@@ -698,25 +605,25 @@ class Hydrator {
     async hydrateLikes(authorDid, uris, ctx) {
         const [likes, profileState] = await Promise.all([
             this.feed.getLikes(uris, ctx.includeTakedowns),
-            this.hydrateProfiles(uris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfiles(uris.map(didFromUri), ctx),
         ]);
         const pairs = [];
         for (const [uri, like] of likes) {
             if (like) {
-                pairs.push([authorDid, (0, uris_1.uriToDid)(uri)]);
+                pairs.push([authorDid, didFromUri(uri)]);
             }
         }
         const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs), ctx);
-        const likeBlocks = new util_1.HydrationMap();
+        const likeBlocks = new HydrationMap();
         for (const [uri, like] of likes) {
             if (like) {
-                likeBlocks.set(uri, isBlocked(blocks, [authorDid, (0, uris_1.uriToDid)(uri)]));
+                likeBlocks.set(uri, isBlocked(blocks, [authorDid, didFromUri(uri)]));
             }
             else {
                 likeBlocks.set(uri, null);
             }
         }
-        return (0, exports.mergeStates)(profileState, { likes, likeBlocks, ctx });
+        return mergeStates(profileState, { likes, likeBlocks, ctx });
     }
     // app.bsky.feed.getRepostedBy#repostedBy
     // - repost
@@ -725,9 +632,9 @@ class Hydrator {
     async hydrateReposts(uris, ctx) {
         const [reposts, profileState] = await Promise.all([
             this.feed.getReposts(uris, ctx.includeTakedowns),
-            this.hydrateProfiles(uris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfiles(uris.map(didFromUri), ctx),
         ]);
-        return (0, exports.mergeStates)(profileState, { reposts, ctx });
+        return mergeStates(profileState, { reposts, ctx });
     }
     // app.bsky.notification.listNotifications#notification
     // - notification
@@ -735,12 +642,12 @@ class Hydrator {
     //     - list basic
     async hydrateNotifications(notifs, ctx) {
         const uris = notifs.map((notif) => notif.uri);
-        const collections = (0, util_1.urisByCollection)(uris);
-        const postUris = collections.get(index_js_1.app.bsky.feed.post.$type) ?? [];
-        const likeUris = collections.get(index_js_1.app.bsky.feed.like.$type) ?? [];
-        const repostUris = collections.get(index_js_1.app.bsky.feed.repost.$type) ?? [];
-        const followUris = collections.get(index_js_1.app.bsky.graph.follow.$type) ?? [];
-        const verificationUris = collections.get(index_js_1.app.bsky.graph.verification.$type) ?? [];
+        const collections = urisByCollection(uris);
+        const postUris = collections.get(app.bsky.feed.post.$type) ?? [];
+        const likeUris = collections.get(app.bsky.feed.like.$type) ?? [];
+        const repostUris = collections.get(app.bsky.feed.repost.$type) ?? [];
+        const followUris = collections.get(app.bsky.graph.follow.$type) ?? [];
+        const verificationUris = collections.get(app.bsky.graph.verification.$type) ?? [];
         const [posts, likes, reposts, follows, verifications, labels, profileState,] = await Promise.all([
             this.feed.getPosts(postUris), // reason: mention, reply, quote
             this.feed.getLikes(likeUris), // reason: like
@@ -748,7 +655,7 @@ class Hydrator {
             this.graph.getFollows(followUris), // reason: follow
             this.graph.getVerifications(verificationUris), // reason: verified
             this.label.getLabelsForSubjects(uris, ctx.labelers),
-            this.hydrateProfiles(uris.map(uris_1.uriToDid), ctx),
+            this.hydrateProfiles(uris.map(didFromUri), ctx),
         ]);
         const viewerRootPostUris = new Set();
         for (const notif of notifs) {
@@ -756,7 +663,7 @@ class Hydrator {
                 const post = posts.get(notif.uri);
                 if (post) {
                     const rootUri = post.record.reply?.root.uri;
-                    if (rootUri && (0, uris_1.uriToDid)(rootUri) === ctx.viewer) {
+                    if (rootUri && didFromUri(rootUri) === ctx.viewer) {
                         viewerRootPostUris.add(rootUri);
                     }
                 }
@@ -766,7 +673,7 @@ class Hydrator {
             ...viewerRootPostUris.values(),
         ]);
         actionTakedownLabels(postUris, posts, labels);
-        return (0, exports.mergeStates)(profileState, {
+        return mergeStates(profileState, {
             posts,
             likes,
             reposts,
@@ -787,14 +694,14 @@ class Hydrator {
         });
         const bookmarks = bookmarksRes.bookmarks.filter((bookmark) => !!bookmark.ref?.key);
         // mapping DID -> stash key -> bookmark
-        const bookmarksMap = new util_1.HydrationMap();
-        bookmarksMap.set(viewer, new util_1.HydrationMap(bookmarks.map((bookmark) => [
+        const bookmarksMap = new HydrationMap();
+        bookmarksMap.set(viewer, new HydrationMap(bookmarks.map((bookmark) => [
             bookmark.ref.key,
             {
                 ref: bookmark.ref,
                 subjectUri: bookmark.subjectUri,
                 subjectCid: bookmark.subjectCid,
-                indexedAt: (0, util_1.parseDate)(bookmark.indexedAt),
+                indexedAt: parseDate(bookmark.indexedAt),
             },
         ])));
         // @NOTE: The `createBookmark` endpoint limits bookmarks to be of posts,
@@ -802,7 +709,7 @@ class Hydrator {
         const postsState = await this.hydratePosts(bookmarks.map((bookmark) => ({
             uri: bookmark.subjectUri,
         })), ctx);
-        return (0, exports.mergeStates)(postsState, { bookmarks: bookmarksMap });
+        return mergeStates(postsState, { bookmarks: bookmarksMap });
     }
     // provides partial hydration state within getFollows / getFollowers, mainly for applying rules
     async hydrateFollows(uris, ctx) {
@@ -810,14 +717,14 @@ class Hydrator {
         const pairs = [];
         for (const [uri, follow] of follows) {
             if (follow) {
-                pairs.push([(0, uris_1.uriToDid)(uri), follow.record.subject]);
+                pairs.push([didFromUri(uri), follow.record.subject]);
             }
         }
         const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs), ctx);
-        const followBlocks = new util_1.HydrationMap();
+        const followBlocks = new HydrationMap();
         for (const [uri, follow] of follows) {
             if (follow) {
-                followBlocks.set(uri, isBlocked(blocks, [(0, uris_1.uriToDid)(uri), follow.record.subject]));
+                followBlocks.set(uri, isBlocked(blocks, [didFromUri(uri), follow.record.subject]));
             }
             else {
                 followBlocks.set(uri, null);
@@ -854,9 +761,9 @@ class Hydrator {
                 }
             }
         }
-        const result = new util_1.HydrationMap();
+        const result = new HydrationMap();
         for (const [source, targets] of didMap) {
-            const didBlocks = new util_1.HydrationMap();
+            const didBlocks = new HydrationMap();
             for (const target of targets) {
                 const block = blocks.get(source, target);
                 // If a list no longer exists or is not a mod list, then remove from block entry.
@@ -867,7 +774,7 @@ class Hydrator {
                 const blockEntry = {
                     blockUri: block?.blockUri,
                     blockListUri: block?.blockListUri &&
-                        listState.actors?.get((0, uris_1.uriToDid)(block.blockListUri))
+                        listState.actors?.get(uriToDid(block.blockListUri))
                         ? block.blockListUri
                         : undefined,
                 };
@@ -890,8 +797,8 @@ class Hydrator {
                 : undefined,
             this.hydrateProfiles(dids, ctx),
         ]);
-        actionTakedownLabels(dids, labelers, profileState.labels ?? new label_1.Labels());
-        return (0, exports.mergeStates)(profileState, {
+        actionTakedownLabels(dids, labelers, profileState.labels ?? new Labels());
+        return mergeStates(profileState, {
             labelers,
             labelerAggs,
             labelerViewers,
@@ -901,79 +808,79 @@ class Hydrator {
     // ad-hoc record hydration
     // in com.atproto.repo.getRecord
     async getRecord(uri, includeTakedowns = false) {
-        const parsed = new syntax_1.AtUri(uri);
+        const parsed = new AtUri(uri);
         const collection = parsed.collection;
-        if (collection === index_js_1.app.bsky.feed.post.$type) {
+        if (collection === app.bsky.feed.post.$type) {
             return ((await this.feed.getPosts([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.feed.repost.$type) {
+        else if (collection === app.bsky.feed.repost.$type) {
             return ((await this.feed.getReposts([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.feed.like.$type) {
+        else if (collection === app.bsky.feed.like.$type) {
             return ((await this.feed.getLikes([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.graph.follow.$type) {
+        else if (collection === app.bsky.graph.follow.$type) {
             return ((await this.graph.getFollows([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.graph.list.$type) {
+        else if (collection === app.bsky.graph.list.$type) {
             return ((await this.graph.getLists([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.graph.listitem.$type) {
+        else if (collection === app.bsky.graph.listitem.$type) {
             return ((await this.graph.getListItems([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.graph.block.$type) {
+        else if (collection === app.bsky.graph.block.$type) {
             return ((await this.graph.getBlocks([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.graph.starterpack.$type) {
+        else if (collection === app.bsky.graph.starterpack.$type) {
             return ((await this.graph.getStarterPacks([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.feed.generator.$type) {
+        else if (collection === app.bsky.feed.generator.$type) {
             return ((await this.feed.getFeedGens([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.feed.threadgate.$type) {
+        else if (collection === app.bsky.feed.threadgate.$type) {
             return ((await this.feed.getThreadgateRecords([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === index_js_1.app.bsky.feed.postgate.$type) {
+        else if (collection === app.bsky.feed.postgate.$type) {
             return ((await this.feed.getPostgateRecords([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === index_js_1.app.bsky.labeler.service.$type) {
+        else if (collection === app.bsky.labeler.service.$type) {
             if (parsed.rkey !== 'self')
                 return;
             const { did } = parsed;
             return ((await this.label.getLabelers([did], includeTakedowns)).get(did) ??
                 undefined);
         }
-        else if (collection === index_js_1.chat.bsky.actor.declaration.$type) {
+        else if (collection === chat.bsky.actor.declaration.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getChatDeclarations([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === index_js_1.com.germnetwork.declaration.$type) {
+        else if (collection === com.germnetwork.declaration.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getGermDeclarations([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === index_js_1.app.bsky.notification.declaration.$type) {
+        else if (collection === app.bsky.notification.declaration.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getNotificationDeclarations([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === index_js_1.app.bsky.actor.status.$type) {
+        else if (collection === app.bsky.actor.status.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getStatus([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === index_js_1.app.bsky.actor.profile.$type) {
+        else if (collection === app.bsky.actor.profile.$type) {
             const did = parsed.did;
             const actor = (await this.actor.getActors([did], { includeTakedowns })).get(did);
             if (!actor?.profile || !actor?.profileCid)
@@ -1013,7 +920,7 @@ class Hydrator {
         });
     }
     async resolveUri(uriStr) {
-        const uri = new syntax_1.AtUri(uriStr);
+        const uri = new AtUri(uriStr);
         const [did] = await this.actor.getDids([uri.host]);
         if (!did)
             return uriStr;
@@ -1021,7 +928,6 @@ class Hydrator {
         return uri.toString();
     }
 }
-exports.Hydrator = Hydrator;
 // service refs may look like "did:plc:example#service_id". we want to extract the did part "did:plc:example".
 const serviceRefToDid = (serviceRef) => {
     const idx = serviceRef.indexOf('#');
@@ -1061,8 +967,8 @@ const isModList = (listUri, state) => {
 const labelSubjectsForDid = (dids) => {
     return [
         ...dids,
-        ...dids.map((did) => syntax_1.AtUri.make(did, index_js_1.app.bsky.actor.profile.$type, 'self').toString()),
-        ...dids.map((did) => syntax_1.AtUri.make(did, index_js_1.app.bsky.actor.status.$type, 'self').toString()),
+        ...dids.map((did) => AtUri.make(did, app.bsky.actor.profile.$type, 'self').toString()),
+        ...dids.map((did) => AtUri.make(did, app.bsky.actor.status.$type, 'self').toString()),
     ];
 };
 const rootUrisFromPosts = (posts) => {
@@ -1093,10 +999,10 @@ const nestedRecordUris = (post) => {
     const uris = [];
     if (!post?.embed)
         return uris;
-    if ((0, types_js_1.isRecordEmbedType)(post.embed)) {
+    if (isRecordEmbedType(post.embed)) {
         uris.push(post.embed.record.uri);
     }
-    else if ((0, types_js_1.isRecordWithMediaType)(post.embed)) {
+    else if (isRecordWithMediaType(post.embed)) {
         uris.push(post.embed.record.record.uri);
     }
     return uris;
@@ -1104,7 +1010,7 @@ const nestedRecordUris = (post) => {
 const getListUrisFromThreadgates = (gates) => {
     const uris = [];
     for (const gate of gates.values()) {
-        const listRules = gate?.record.allow?.filter(types_js_1.isListRuleType) ?? [];
+        const listRules = gate?.record.allow?.filter(isListRuleType) ?? [];
         for (const rule of listRules) {
             uris.push(rule.list);
         }
@@ -1125,53 +1031,51 @@ const pairsToMap = (pairs) => {
     }
     return map;
 };
-const mergeStates = (stateA, stateB) => {
-    (0, node_assert_1.default)(!stateA.ctx?.viewer ||
+export const mergeStates = (stateA, stateB) => {
+    assert(!stateA.ctx?.viewer ||
         !stateB.ctx?.viewer ||
         stateA.ctx?.viewer === stateB.ctx?.viewer, 'incompatible viewers');
     return {
         ctx: stateA.ctx ?? stateB.ctx,
-        actors: (0, util_1.mergeMaps)(stateA.actors, stateB.actors),
-        profileAggs: (0, util_1.mergeMaps)(stateA.profileAggs, stateB.profileAggs),
-        profileViewers: (0, util_1.mergeMaps)(stateA.profileViewers, stateB.profileViewers),
-        posts: (0, util_1.mergeMaps)(stateA.posts, stateB.posts),
-        postAggs: (0, util_1.mergeMaps)(stateA.postAggs, stateB.postAggs),
-        postViewers: (0, util_1.mergeMaps)(stateA.postViewers, stateB.postViewers),
-        threadContexts: (0, util_1.mergeMaps)(stateA.threadContexts, stateB.threadContexts),
-        postBlocks: (0, util_1.mergeMaps)(stateA.postBlocks, stateB.postBlocks),
-        reposts: (0, util_1.mergeMaps)(stateA.reposts, stateB.reposts),
-        follows: (0, util_1.mergeMaps)(stateA.follows, stateB.follows),
-        followBlocks: (0, util_1.mergeMaps)(stateA.followBlocks, stateB.followBlocks),
-        threadgates: (0, util_1.mergeMaps)(stateA.threadgates, stateB.threadgates),
-        postgates: (0, util_1.mergeMaps)(stateA.postgates, stateB.postgates),
-        lists: (0, util_1.mergeMaps)(stateA.lists, stateB.lists),
-        listAggs: (0, util_1.mergeMaps)(stateA.listAggs, stateB.listAggs),
-        listMemberships: (0, util_1.mergeNestedMaps)(stateA.listMemberships, stateB.listMemberships),
-        listViewers: (0, util_1.mergeMaps)(stateA.listViewers, stateB.listViewers),
-        listItems: (0, util_1.mergeMaps)(stateA.listItems, stateB.listItems),
-        likes: (0, util_1.mergeMaps)(stateA.likes, stateB.likes),
-        likeBlocks: (0, util_1.mergeMaps)(stateA.likeBlocks, stateB.likeBlocks),
-        labels: (0, util_1.mergeMaps)(stateA.labels, stateB.labels),
-        feedgens: (0, util_1.mergeMaps)(stateA.feedgens, stateB.feedgens),
-        feedgenAggs: (0, util_1.mergeMaps)(stateA.feedgenAggs, stateB.feedgenAggs),
-        feedgenViewers: (0, util_1.mergeMaps)(stateA.feedgenViewers, stateB.feedgenViewers),
-        starterPacks: (0, util_1.mergeMaps)(stateA.starterPacks, stateB.starterPacks),
-        starterPackAggs: (0, util_1.mergeMaps)(stateA.starterPackAggs, stateB.starterPackAggs),
-        labelers: (0, util_1.mergeMaps)(stateA.labelers, stateB.labelers),
-        labelerAggs: (0, util_1.mergeMaps)(stateA.labelerAggs, stateB.labelerAggs),
-        labelerViewers: (0, util_1.mergeMaps)(stateA.labelerViewers, stateB.labelerViewers),
-        knownFollowers: (0, util_1.mergeMaps)(stateA.knownFollowers, stateB.knownFollowers),
-        activitySubscriptions: (0, util_1.mergeMaps)(stateA.activitySubscriptions, stateB.activitySubscriptions),
-        bidirectionalBlocks: (0, util_1.mergeNestedMaps)(stateA.bidirectionalBlocks, stateB.bidirectionalBlocks),
-        verifications: (0, util_1.mergeMaps)(stateA.verifications, stateB.verifications),
-        bookmarks: (0, util_1.mergeNestedMaps)(stateA.bookmarks, stateB.bookmarks),
+        actors: mergeMaps(stateA.actors, stateB.actors),
+        profileAggs: mergeMaps(stateA.profileAggs, stateB.profileAggs),
+        profileViewers: mergeMaps(stateA.profileViewers, stateB.profileViewers),
+        posts: mergeMaps(stateA.posts, stateB.posts),
+        postAggs: mergeMaps(stateA.postAggs, stateB.postAggs),
+        postViewers: mergeMaps(stateA.postViewers, stateB.postViewers),
+        threadContexts: mergeMaps(stateA.threadContexts, stateB.threadContexts),
+        postBlocks: mergeMaps(stateA.postBlocks, stateB.postBlocks),
+        reposts: mergeMaps(stateA.reposts, stateB.reposts),
+        follows: mergeMaps(stateA.follows, stateB.follows),
+        followBlocks: mergeMaps(stateA.followBlocks, stateB.followBlocks),
+        threadgates: mergeMaps(stateA.threadgates, stateB.threadgates),
+        postgates: mergeMaps(stateA.postgates, stateB.postgates),
+        lists: mergeMaps(stateA.lists, stateB.lists),
+        listAggs: mergeMaps(stateA.listAggs, stateB.listAggs),
+        listMemberships: mergeNestedMaps(stateA.listMemberships, stateB.listMemberships),
+        listViewers: mergeMaps(stateA.listViewers, stateB.listViewers),
+        listItems: mergeMaps(stateA.listItems, stateB.listItems),
+        likes: mergeMaps(stateA.likes, stateB.likes),
+        likeBlocks: mergeMaps(stateA.likeBlocks, stateB.likeBlocks),
+        labels: mergeMaps(stateA.labels, stateB.labels),
+        feedgens: mergeMaps(stateA.feedgens, stateB.feedgens),
+        feedgenAggs: mergeMaps(stateA.feedgenAggs, stateB.feedgenAggs),
+        feedgenViewers: mergeMaps(stateA.feedgenViewers, stateB.feedgenViewers),
+        starterPacks: mergeMaps(stateA.starterPacks, stateB.starterPacks),
+        starterPackAggs: mergeMaps(stateA.starterPackAggs, stateB.starterPackAggs),
+        labelers: mergeMaps(stateA.labelers, stateB.labelers),
+        labelerAggs: mergeMaps(stateA.labelerAggs, stateB.labelerAggs),
+        labelerViewers: mergeMaps(stateA.labelerViewers, stateB.labelerViewers),
+        knownFollowers: mergeMaps(stateA.knownFollowers, stateB.knownFollowers),
+        activitySubscriptions: mergeMaps(stateA.activitySubscriptions, stateB.activitySubscriptions),
+        bidirectionalBlocks: mergeNestedMaps(stateA.bidirectionalBlocks, stateB.bidirectionalBlocks),
+        verifications: mergeMaps(stateA.verifications, stateB.verifications),
+        bookmarks: mergeNestedMaps(stateA.bookmarks, stateB.bookmarks),
     };
 };
-exports.mergeStates = mergeStates;
-const mergeManyStates = (...states) => {
-    return states.reduce(exports.mergeStates, {});
+export const mergeManyStates = (...states) => {
+    return states.reduce(mergeStates, {});
 };
-exports.mergeManyStates = mergeManyStates;
 const actionTakedownLabels = (keys, hydrationMap, labels) => {
     for (const key of keys) {
         if (labels.get(key)?.isTakendown) {