@atproto/bsky 0.0.241 → 0.0.243

package/src/data-plane/server/routes/notifs.ts

@@ -32,17 +32,18 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     let builder = db.db
       .selectFrom('notification as notif')
       .where('notif.did', '=', actorDid)
-      .where((clause) =>
-        clause
-          .where('reasonSubject', 'is', null)
-          .orWhereExists(
+      .where((eb) =>
+        eb.or([
+          eb('reasonSubject', 'is', null),
+          eb.exists(
             db.db
               .selectFrom('record as subject')
               .selectAll()
               .whereRef('subject.uri', '=', ref('notif.reasonSubject')),
           ),
+        ]),
       )
-      .if(priority, (qb) => qb.whereExists(priorityFollowQb))
+      .$if(priority, (qb) => qb.where(({ exists }) => exists(priorityFollowQb)))
       .select([
         'notif.author as authorDid',
         'notif.recordUri as uri',
@@ -117,13 +118,15 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       // Ensure to hit notification_did_sortat_idx, handling case where lastSeenNotifs is null.
       .where('notification.did', '=', actorDid)
       .where('notification.sortAt', '>', lastSeen ?? '')
-      .if(priority, (qb) =>
-        qb.whereExists(
-          db.db
-            .selectFrom('follow')
-            .select(sql<boolean>`${true}`.as('val'))
-            .where('creator', '=', actorDid)
-            .whereRef('subjectDid', '=', ref('notification.author')),
+      .$if(priority, (qb) =>
+        qb.where(({ exists }) =>
+          exists(
+            db.db
+              .selectFrom('follow')
+              .select(sql<boolean>`${true}`.as('val'))
+              .where('creator', '=', actorDid)
+              .whereRef('subjectDid', '=', ref('notification.author')),
+          ),
         ),
       )
       .executeTakeFirst()

package/src/data-plane/server/routes/relationships.ts

@@ -95,9 +95,11 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { ref } = db.db.dynamic
     const sourceRef = ref('pair.source')
     const targetRef = ref('pair.target')
-    const values = valuesList(pairs.map((p) => sql`${p.a}, ${p.b}`))
+    const values = valuesList<{ source: string; target: string }>(
+      pairs.map((p) => sql`${p.a}, ${p.b}`),
+    )
     const res = await db.db
-      .selectFrom(values.as(sql`pair (source, target)`))
+      .selectFrom(values.as<'pair'>(sql`pair (source, target)`))
       .select([
         sql<string>`${sourceRef}`.as('source'),
         sql<string>`${targetRef}`.as('target'),

package/src/data-plane/server/routes/suggestions.ts

@@ -41,7 +41,7 @@ const getFollowSuggestionsGlobal = async (
   const suggestions = await db.db
     .selectFrom('suggested_follow')
     .innerJoin('actor', 'actor.did', 'suggested_follow.did')
-    .if(alreadyIncluded.length > 0, (qb) =>
+    .$if(alreadyIncluded.length > 0, (qb) =>
       qb.where('suggested_follow.order', 'not in', alreadyIncluded),
     )
     .selectAll()
@@ -116,7 +116,7 @@ const getFollowSuggestionsRelativeTo = async (
       .where('follow.creator', '=', input.actorDid)
       .where('follow.subjectDid', '!=', input.relativeToDid)
       .where('follow.subjectDid', 'not in', actorsViewerFollows)
-      .if(resultDids.length > 0, (qb) =>
+      .$if(resultDids.length > 0, (qb) =>
         qb.where(
           'subjectDid',
           'not in',

package/tests/data-plane/subscription.test.ts

@@ -1,8 +1,8 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, describe, expect, it, vitest } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { cborDecode, cborEncode } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { CommitDataWithOps, sequencer } from '@atproto/pds'
+import { sequencer } from '@atproto/pds'
 import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema.js'
 import { forSnapshot } from '../_util.js'
 
@@ -70,17 +70,20 @@ describe('sync', () => {
 
   it('indexes actor when commit is unprocessable.', async () => {
     // mock sequencing to create an unprocessable commit event
-    const sequenceCommitOrig = network.pds.ctx.sequencer.sequenceCommit
-    network.pds.ctx.sequencer.sequenceCommit = async function (
-      did: string,
-      commitData: CommitDataWithOps,
-    ) {
-      const seqEvt = await sequencer.formatSeqCommit(did, commitData)
-      const evt = cborDecode(seqEvt.event) as sequencer.CommitEvt
-      evt.blocks = new Uint8Array() // bad blocks
-      seqEvt.event = cborEncode(evt)
-      return await network.pds.ctx.sequencer.sequenceEvt(seqEvt)
-    }
+    using _ = vitest
+      .spyOn(network.pds.ctx.sequencer, 'sequenceCommit')
+      .mockImplementation(async function (
+        this: typeof network.pds.ctx.sequencer,
+        did,
+        commitData,
+      ) {
+        const seqEvt = await sequencer.formatSeqCommit(did, commitData)
+        const evt = cborDecode(seqEvt.event) as sequencer.CommitEvt
+        evt.blocks = new Uint8Array() // bad blocks
+        seqEvt.event = cborEncode(evt)
+        await this.sequenceEvts([seqEvt])
+      })
+
     // create account and index the initial commit event
     await sc.createAccount('jack', {
       handle: 'jack.test',
@@ -91,7 +94,6 @@ describe('sync', () => {
     // confirm jack was indexed as an actor despite the bad event
     const actors = await dumpTable(network.bsky.db, 'actor', ['did'])
     expect(actors.map((a) => a.handle)).toContain('jack.test')
-    network.pds.ctx.sequencer.sequenceCommit = sequenceCommitOrig
   })
 
   async function updateProfile(
@@ -116,8 +118,8 @@ async function dumpTable<T extends keyof DatabaseSchemaType>(
   tableName: T,
   pkeys: (keyof DatabaseSchemaType[T] & string)[],
 ) {
-  const { ref } = db.db.dynamic
-  let builder = db.db.selectFrom(tableName).selectAll()
+  const { ref, table } = db.db.dynamic
+  let builder = db.db.selectFrom(table(tableName).as('t')).selectAll()
   pkeys.forEach((key) => {
     builder = builder.orderBy(ref(key))
   })