@atproto/bsky 0.0.221 → 0.0.223

package/tests/views/starter-packs.test.ts

@@ -1,15 +1,15 @@
 import assert from 'node:assert'
-import { AtpAgent, asPredicate } from '@atproto/api'
-import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { validateRecord as validateProfileRecord } from '../../src/lexicon/types/app/bsky/actor/profile'
 import {
-  OutputSchema as GetStarterPacksWithMembershipOutputSchema,
-  StarterPackWithMembership,
-} from '../../src/lexicon/types/app/bsky/graph/getStarterPacksWithMembership'
+  AppBskyActorProfile,
+  AppBskyGraphGetStarterPacksWithMembership,
+  AtpAgent,
+  asPredicate,
+  ids,
+} from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot, paginateAll } from '../_util'
 
-const isValidProfile = asPredicate(validateProfileRecord)
+const isValidProfile = asPredicate(AppBskyActorProfile.validateRecord)
 
 describe('starter packs', () => {
   let network: TestNetwork
@@ -24,7 +24,7 @@ describe('starter packs', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_starter_packs',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -266,7 +266,9 @@ describe('starter packs', () => {
   })
 
   describe('starter pack membership', () => {
-    const membershipsUris = (lwms: StarterPackWithMembership[]): string[] =>
+    const membershipsUris = (
+      lwms: AppBskyGraphGetStarterPacksWithMembership.StarterPackWithMembership[],
+    ): string[] =>
       lwms
         .map((spwm) => spwm.listItem?.uri)
         .filter((li): li is string => typeof li === 'string')
@@ -351,8 +353,9 @@ describe('starter packs', () => {
       const viewer = sc.dids.alice
       const actor = sc.dids.bob
 
-      const results = (out: GetStarterPacksWithMembershipOutputSchema[]) =>
-        out.flatMap((res) => res.starterPacksWithMembership)
+      const results = (
+        out: AppBskyGraphGetStarterPacksWithMembership.OutputSchema[],
+      ) => out.flatMap((res) => res.starterPacksWithMembership)
       const paginator = async (cursor?: string) => {
         const res = await agent.app.bsky.graph.getStarterPacksWithMembership(
           { actor, limit: 2, cursor },

package/tests/views/suggestions.test.ts

@@ -1,6 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
 import { stripViewer } from '../_util'
 
 describe('pds user search views', () => {
@@ -12,7 +11,7 @@ describe('pds user search views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_suggestions',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()

package/tests/views/thread-v2.test.ts

@@ -1,20 +1,22 @@
 import assert from 'node:assert'
-import { AppBskyUnspeccedDefs, AtpAgent } from '@atproto/api'
-import { SeedClient, TestNetwork, seedThreadV2 } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { ThreadItemPost } from '../../src/lexicon/types/app/bsky/unspecced/defs'
-import { OutputSchema as OutputSchemaHiddenThread } from '../../src/lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'
 import {
-  OutputSchema as OutputSchemaThread,
-  QueryParams as QueryParamsThread,
-} from '../../src/lexicon/types/app/bsky/unspecced/getPostThreadV2'
+  AppBskyUnspeccedDefs,
+  AppBskyUnspeccedGetPostThreadOtherV2,
+  AppBskyUnspeccedGetPostThreadV2,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
+import { SeedClient, TestNetwork, seedThreadV2 } from '@atproto/dev-env'
 import {
   ThreadItemValuePost,
   ThreadOtherItemValuePost,
 } from '../../src/views/threads-v2'
 import { forSnapshot } from '../_util'
 
-type PostProps = Pick<ThreadItemPost, 'moreReplies' | 'opThread'>
+type PostProps = Pick<
+  AppBskyUnspeccedDefs.ThreadItemPost,
+  'moreReplies' | 'opThread'
+>
 const props = (overrides: Partial<PostProps> = {}): PostProps => ({
   moreReplies: 0,
   opThread: false,
@@ -22,7 +24,7 @@ const props = (overrides: Partial<PostProps> = {}): PostProps => ({
 })
 
 type PostPropsHidden = Pick<
-  ThreadItemPost,
+  AppBskyUnspeccedDefs.ThreadItemPost,
   'hiddenByThreadgate' | 'mutedByViewer'
 >
 const propsHidden = (
@@ -48,7 +50,7 @@ describe('appview thread views v2', () => {
       },
       dbPostgresSchema: 'bsky_views_thread_v_two',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     labelerDid = network.bsky.ctx.cfg.modServiceDid
     await network.processAll()
@@ -440,12 +442,12 @@ describe('appview thread views v2', () => {
     type Case =
       | {
           branchingFactor: number
-          sort: QueryParamsThread['sort']
+          sort: AppBskyUnspeccedGetPostThreadV2.QueryParams['sort']
           postKeys: string[]
         }
       | {
           branchingFactor: number
-          sort: QueryParamsThread['sort']
+          sort: AppBskyUnspeccedGetPostThreadV2.QueryParams['sort']
           // For higher branching factors it gets too verbose to write all posts.
           length: number
         }
@@ -782,7 +784,7 @@ describe('appview thread views v2', () => {
 
         assertPosts(t)
         expect(hasOtherReplies).toBe(false)
-        const opThreadPostsUris = new Set(
+        const opThreadPostsUris = new Set<string>(
           opThreadPosts.map((k) =>
             k === 'root' ? seed.root.ref.uriStr : seed.r[k].ref.uriStr,
           ),
@@ -806,7 +808,7 @@ describe('appview thread views v2', () => {
       })
 
       type Case = {
-        sort: QueryParamsThread['sort']
+        sort: AppBskyUnspeccedGetPostThreadV2.QueryParams['sort']
         postKeys: string[]
       }
 
@@ -905,7 +907,7 @@ describe('appview thread views v2', () => {
         })
 
         type Case = {
-          sort: QueryParamsThread['sort']
+          sort: AppBskyUnspeccedGetPostThreadV2.QueryParams['sort']
           postKeys: string[]
         }
 
@@ -957,7 +959,7 @@ describe('appview thread views v2', () => {
         })
 
         type Case = {
-          sort: QueryParamsThread['sort']
+          sort: AppBskyUnspeccedGetPostThreadV2.QueryParams['sort']
           postKeys: string[]
         }
 
@@ -1982,7 +1984,7 @@ describe('appview thread views v2', () => {
 })
 
 function assertPosts(
-  t: OutputSchemaThread['thread'],
+  t: AppBskyUnspeccedGetPostThreadV2.OutputSchema['thread'],
 ): asserts t is ThreadItemValuePost[] {
   t.forEach((i) => {
     assert(
@@ -1993,7 +1995,7 @@ function assertPosts(
 }
 
 function assertHiddenPosts(
-  t: OutputSchemaHiddenThread['thread'],
+  t: AppBskyUnspeccedGetPostThreadOtherV2.OutputSchema['thread'],
 ): asserts t is ThreadOtherItemValuePost[] {
   t.forEach((i) => {
     assert(

package/tests/views/thread.test.ts

@@ -1,8 +1,12 @@
 import assert from 'node:assert'
-import { AppBskyFeedGetPostThread, AtUri, AtpAgent } from '@atproto/api'
+import {
+  AppBskyFeedDefs,
+  AppBskyFeedGetPostThread,
+  AtUri,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { isThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
 import {
   assertIsThreadViewPost,
   forSnapshot,
@@ -24,8 +28,8 @@ describe('appview thread views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_thread',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
@@ -408,8 +412,10 @@ describe('appview thread views', () => {
         },
       )
 
-      assert(isThreadViewPost(threadPreTakedown.data.thread))
-      assert(isThreadViewPost(threadPreTakedown.data.thread.parent))
+      assert(AppBskyFeedDefs.isThreadViewPost(threadPreTakedown.data.thread))
+      assert(
+        AppBskyFeedDefs.isThreadViewPost(threadPreTakedown.data.thread.parent),
+      )
 
       const parent = threadPreTakedown.data.thread.parent.post
 
@@ -447,11 +453,19 @@ describe('appview thread views', () => {
         },
       )
 
-      assert(isThreadViewPost(threadPreTakedown.data.thread))
-      assert(isThreadViewPost(threadPreTakedown.data.thread.replies?.[0]))
-      assert(isThreadViewPost(threadPreTakedown.data.thread.replies?.[1]))
+      assert(AppBskyFeedDefs.isThreadViewPost(threadPreTakedown.data.thread))
+      assert(
+        AppBskyFeedDefs.isThreadViewPost(
+          threadPreTakedown.data.thread.replies?.[0],
+        ),
+      )
+      assert(
+        AppBskyFeedDefs.isThreadViewPost(
+          threadPreTakedown.data.thread.replies?.[1],
+        ),
+      )
       assert(
-        isThreadViewPost(
+        AppBskyFeedDefs.isThreadViewPost(
           threadPreTakedown.data.thread.replies?.[1].replies?.[0],
         ),
       )

package/tests/views/threadgating.test.ts

@@ -1,11 +1,6 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import { AppBskyFeedDefs, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import {
-  isNotFoundPost,
-  isThreadViewPost,
-} from '../../src/lexicon/types/app/bsky/feed/defs'
 import { forSnapshot } from '../_util'
 
 describe('views with thread gating', () => {
@@ -18,8 +13,8 @@ describe('views with thread gating', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_thread_gating',
     })
-    agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
+    agent = network.bsky.getAgent()
+    pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await sc.createAccount('eve', {
@@ -69,7 +64,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(thread))
+    assert(AppBskyFeedDefs.isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
     expect(thread.post.viewer?.replyDisabled).toBe(true)
     expect(thread.replies?.length).toEqual(0)
@@ -162,7 +157,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(aliceThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(aliceThread))
     expect(aliceThread.post.viewer?.replyDisabled).toBe(true)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
     const {
@@ -176,12 +171,12 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(danThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
     expect(danThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply, ...otherReplies] = danThread.replies ?? []
-    assert(isThreadViewPost(reply))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
     expect(reply.post.uri).toEqual(danReply.ref.uriStr)
   })
@@ -223,7 +218,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(danThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(danThread))
     expect(danThread.post.viewer?.replyDisabled).toBe(true)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, true)
     const {
@@ -237,12 +232,12 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(aliceThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(aliceThread))
     expect(forSnapshot(aliceThread.post.threadgate)).toMatchSnapshot()
     expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
-    assert(isThreadViewPost(reply))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
     expect(reply.post.uri).toEqual(aliceReply.ref.uriStr)
   })
@@ -287,7 +282,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(danThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(danThread))
     expect(danThread.post.viewer?.replyDisabled).toBe(true)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, true)
     const {
@@ -301,12 +296,12 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(aliceThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(aliceThread))
     expect(forSnapshot(aliceThread.post.threadgate)).toMatchSnapshot()
     expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
-    assert(isThreadViewPost(reply))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
     expect(reply.post.uri).toEqual(aliceReply.ref.uriStr)
   })
@@ -389,7 +384,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(bobThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(bobThread))
     expect(bobThread.post.viewer?.replyDisabled).toBe(true)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, true)
     const {
@@ -403,7 +398,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(aliceThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(aliceThread))
     expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const {
@@ -417,13 +412,13 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(danThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
     expect(danThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
     const [reply1, reply2, ...otherReplies] = aliceThread.replies ?? []
-    assert(isThreadViewPost(reply1))
-    assert(isThreadViewPost(reply2))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply1))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply2))
     expect(otherReplies.length).toEqual(0)
     expect([reply1.post.uri, reply2.post.uri].sort()).toEqual(
       [danReply.ref.uriStr, aliceReply.ref.uriStr].sort(),
@@ -465,7 +460,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(thread))
+    assert(AppBskyFeedDefs.isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
     expect(thread.post.viewer?.replyDisabled).toBe(true)
     expect(thread.replies?.length).toEqual(0)
@@ -528,7 +523,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(eveThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(eveThread))
     // eve cannot interact
     expect(eveThread.post.viewer?.replyDisabled).toBe(true)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.eve, true)
@@ -544,7 +539,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(bobThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(bobThread))
     // bob follows carol, followers can reply
     expect(bobThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, false)
@@ -560,7 +555,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(aliceThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(aliceThread))
     // carol follows alice, followed users can reply
     expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
@@ -576,16 +571,16 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(danThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
     // dan was mentioned, mentioned users can reply
     expect(danThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
 
     const [reply1, reply2, reply3, ...otherReplies] = aliceThread.replies ?? []
-    assert(isThreadViewPost(reply1))
-    assert(isThreadViewPost(reply2))
-    assert(isThreadViewPost(reply3))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply1))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply2))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply3))
     expect(otherReplies.length).toEqual(0)
     expect([reply1.post.uri, reply2.post.uri, reply3.post.uri].sort()).toEqual(
       [aliceReply.ref.uriStr, danReply.ref.uriStr, bobReply.ref.uriStr].sort(),
@@ -618,12 +613,12 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(thread))
+    assert(AppBskyFeedDefs.isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
     expect(thread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = thread.replies ?? []
-    assert(isThreadViewPost(reply))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
     expect(reply.post.uri).toEqual(aliceReply.ref.uriStr)
   })
@@ -677,7 +672,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(danThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(danThread))
     expect(danThread.post.viewer?.replyDisabled).toBe(true)
     await checkReplyDisabled(orphanedReply.ref.uriStr, sc.dids.dan, true)
     const {
@@ -687,20 +682,20 @@ describe('views with thread gating', () => {
       {
         headers: await network.serviceHeaders(
           sc.dids.alice,
-          ids.AppBskyFeedGetPostThread,
+          'app.bsky.feed.getPostThread',
         ),
       },
     )
-    assert(isThreadViewPost(aliceThread))
+    assert(AppBskyFeedDefs.isThreadViewPost(aliceThread))
     assert(
-      isNotFoundPost(aliceThread.parent) &&
+      AppBskyFeedDefs.isNotFoundPost(aliceThread.parent) &&
         aliceThread.parent.uri === post.ref.uriStr,
     )
     expect(aliceThread.post.threadgate).toMatchSnapshot()
     expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(orphanedReply.ref.uriStr, sc.dids.alice, false)
     const [reply, ...otherReplies] = aliceThread.replies ?? []
-    assert(isThreadViewPost(reply))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
     expect(reply.post.uri).toEqual(aliceReply.ref.uriStr)
   })
@@ -731,12 +726,12 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(thread))
+    assert(AppBskyFeedDefs.isThreadViewPost(thread))
     expect(forSnapshot(thread.post.threadgate)).toMatchSnapshot()
     expect(thread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.carol, false)
     const [reply, ...otherReplies] = thread.replies ?? []
-    assert(isThreadViewPost(reply))
+    assert(AppBskyFeedDefs.isThreadViewPost(reply))
     expect(otherReplies.length).toEqual(0)
     expect(reply.post.uri).toEqual(selfReply.ref.uriStr)
   })
@@ -775,7 +770,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(thread))
+    assert(AppBskyFeedDefs.isThreadViewPost(thread))
     expect(thread.post.viewer?.replyDisabled).toBe(true) // nobody can reply to this, not even alice.
     expect(thread.replies).toBeUndefined()
     expect(thread.parent).toBeUndefined()
@@ -822,7 +817,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(threadA))
+    assert(AppBskyFeedDefs.isThreadViewPost(threadA))
     expect(threadA.post.threadgate).toBeUndefined()
     expect(threadA.post.viewer?.replyDisabled).toBeUndefined()
     expect(threadA.replies?.length).toEqual(1)
@@ -838,7 +833,7 @@ describe('views with thread gating', () => {
         ),
       },
     )
-    assert(isThreadViewPost(threadB))
+    assert(AppBskyFeedDefs.isThreadViewPost(threadB))
     expect(threadB.post.threadgate).toBeUndefined()
     expect(threadB.post.viewer?.replyDisabled).toBe(undefined)
     await checkReplyDisabled(postB.ref.uriStr, sc.dids.alice, undefined)

package/tests/views/timeline.test.ts

@@ -1,5 +1,10 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import {
+  AppBskyFeedDefs,
+  AppBskyFeedGetTimeline,
+  AtpAgent,
+  ids,
+} from '@atproto/api'
 import {
   EXAMPLE_LABELER,
   SeedClient,
@@ -7,9 +12,6 @@ import {
   basicSeed,
 } from '@atproto/dev-env'
 import { Database } from '../../src'
-import { ids } from '../../src/lexicon/lexicons'
-import { FeedViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { OutputSchema as GetTimelineOutputSchema } from '../../src/lexicon/types/app/bsky/feed/getTimeline'
 import { forSnapshot, getOriginator, paginateAll } from '../_util'
 
 const REVERSE_CHRON = 'reverse-chronological'
@@ -29,7 +31,7 @@ describe('timeline views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_home_feed',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
@@ -59,13 +61,14 @@ describe('timeline views', () => {
   // @TODO(bsky) blocks posts, reposts, replies by record takedown via labels
 
   it("fetches authenticated user's home feed w/ reverse-chronological algorithm", async () => {
-    const expectOriginatorFollowedBy = (did) => (item: FeedViewPost) => {
-      const originator = getOriginator(item)
-      // The user expects to see posts & reposts from themselves and follows
-      if (did !== originator) {
-        expect(sc.follows[did]).toHaveProperty(originator)
+    const expectOriginatorFollowedBy =
+      (did: string) => (item: AppBskyFeedDefs.FeedViewPost) => {
+        const originator = getOriginator(item as any)
+        // The user expects to see posts & reposts from themselves and follows
+        if (did !== originator) {
+          expect(sc.follows[did]).toHaveProperty(originator)
+        }
       }
-    }
 
     const aliceTL = await agent.api.app.bsky.feed.getTimeline(
       { algorithm: REVERSE_CHRON },
@@ -137,7 +140,7 @@ describe('timeline views', () => {
   })
 
   it('paginates reverse-chronological feed', async () => {
-    const results = (results: GetTimelineOutputSchema[]) =>
+    const results = (results: AppBskyFeedGetTimeline.OutputSchema[]) =>
       results.flatMap((res) => res.feed)
     const paginator = async (cursor?: string) => {
       const res = await agent.api.app.bsky.feed.getTimeline(

package/tests/views/verification.test.ts

@@ -1,15 +1,13 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import { AppBskyActorDefs, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, verificationsSeed } from '@atproto/dev-env'
-import { ids } from '../../src/lexicon/lexicons'
-import { VerificationState } from '../../src/lexicon/types/app/bsky/actor/defs'
 
 interface ProfileViewTestCase {
   description: string
   // The DIDs are only set during test setup, so data that depends on those DIDs
   // needs to be lazily evaluated by using a function.
   getDid: () => string
-  getExpected: () => VerificationState | undefined
+  getExpected: () => AppBskyActorDefs.VerificationState | undefined
   getExpectedUrisPrefixes?: () => string[]
 }
 
@@ -38,7 +36,7 @@ describe('verification views', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_views_verification',
     })
-    agent = network.bsky.getClient()
+    agent = network.bsky.getAgent()
     sc = network.getSeedClient()
 
     await verificationsSeed(sc)