@atproto/api 0.14.0-next.2 → 0.14.0-next.3

package/src/agent.ts

@@ -1,4 +1,4 @@
-import { TID } from '@atproto/common-web'
+import { retry, TID } from '@atproto/common-web'
 import { AtUri, ensureValidDid } from '@atproto/syntax'
 import { buildFetchHandler, FetchHandler, XrpcClient } from '@atproto/xrpc'
 import AwaitLock from 'await-lock'
@@ -15,7 +15,7 @@ import {
 } from './client/index'
 import { schemas } from './client/lexicons'
 import { MutedWord, Nux } from './client/types/app/bsky/actor/defs'
-import { $Typed } from './client/util'
+import { $Typed, Un$Typed } from './client/util'
 import { BSKY_LABELER_DID } from './const'
 import { interpretLabelValueDefinitions } from './moderation'
 import { DEFAULT_LABEL_SETTINGS } from './moderation/const/labels'
@@ -25,6 +25,7 @@ import {
   ModerationPrefs,
 } from './moderation/types'
 import { SessionManager } from './session-manager'
+import * as predicate from './predicate'
 import {
   AtpAgentGlobalOpts,
   AtprotoServiceType,
@@ -442,56 +443,52 @@ export class Agent extends XrpcClient {
   async upsertProfile(
     updateFn: (
       existing: AppBskyActorProfile.Record | undefined,
-    ) => AppBskyActorProfile.Record | Promise<AppBskyActorProfile.Record>,
+    ) =>
+      | Un$Typed<AppBskyActorProfile.Record>
+      | Promise<Un$Typed<AppBskyActorProfile.Record>>,
   ) {
-    const repo = this.accountDid
+    const upsert = async () => {
+      const repo = this.assertDid
+      const collection = 'app.bsky.actor.profile'
 
-    let retriesRemaining = 5
-    while (retriesRemaining >= 0) {
-      // fetch existing
       const existing = await this.com.atproto.repo
         .getRecord({
           repo,
-          collection: 'app.bsky.actor.profile',
+          collection,
           rkey: 'self',
         })
         .catch((_) => undefined)
 
       // run the update
-      const updated = await updateFn(existing?.data.value)
-      if (updated) {
-        updated.$type = 'app.bsky.actor.profile'
-      }
+      const updated = await updateFn(
+        predicate.isValidProfile(existing?.data.value)
+          ? existing.data.value
+          : undefined,
+      )
+
+      // validate the value returned by the update function
+      const validation = AppBskyActorProfile.validateRecord({
+        $type: collection,
+        ...updated,
+      })
 
-      // validate the record
-      const validation = AppBskyActorProfile.validateRecord(updated)
       if (!validation.success) {
         throw validation.error
       }
 
-      try {
-        // attempt the put
-        await this.com.atproto.repo.putRecord({
-          repo,
-          collection: 'app.bsky.actor.profile',
-          rkey: 'self',
-          record: updated,
-          swapRecord: existing?.data.cid || null,
-        })
-      } catch (e: unknown) {
-        if (
-          retriesRemaining > 0 &&
-          e instanceof ComAtprotoRepoPutRecord.InvalidSwapError
-        ) {
-          // try again
-          retriesRemaining--
-          continue
-        } else {
-          throw e
-        }
-      }
-      break
+      await this.com.atproto.repo.putRecord({
+        repo,
+        collection,
+        rkey: 'self',
+        record: validation.value,
+        swapRecord: existing?.data.cid || null,
+      })
     }
+
+    return retry(upsert, {
+      maxRetries: 5,
+      retryable: (e) => e instanceof ComAtprotoRepoPutRecord.InvalidSwapError,
+    })
   }
 
   async mute(actor: string) {
@@ -579,14 +576,14 @@ export class Agent extends XrpcClient {
     const res = await this.app.bsky.actor.getPreferences({})
     const labelPrefs: AppBskyActorDefs.ContentLabelPref[] = []
     for (const pref of res.data.preferences) {
-      if (AppBskyActorDefs.isValidAdultContentPref(pref)) {
+      if (predicate.isValidAdultContentPref(pref)) {
         // adult content preferences
         prefs.moderationPrefs.adultContentEnabled = pref.enabled
-      } else if (AppBskyActorDefs.isValidContentLabelPref(pref)) {
+      } else if (predicate.isValidContentLabelPref(pref)) {
         // content label preference
         const adjustedPref = adjustLegacyContentLabelPref(pref)
         labelPrefs.push(adjustedPref)
-      } else if (AppBskyActorDefs.isValidLabelersPref(pref)) {
+      } else if (predicate.isValidLabelersPref(pref)) {
         // labelers preferences
         prefs.moderationPrefs.labelers = this.appLabelers
           .map((did: string) => ({ did, labels: {} }))
@@ -596,29 +593,29 @@ export class Agent extends XrpcClient {
               labels: {},
             })),
           )
-      } else if (AppBskyActorDefs.isValidSavedFeedsPrefV2(pref)) {
+      } else if (predicate.isValidSavedFeedsPrefV2(pref)) {
         prefs.savedFeeds = pref.items
-      } else if (AppBskyActorDefs.isValidSavedFeedsPref(pref)) {
+      } else if (predicate.isValidSavedFeedsPref(pref)) {
         // saved and pinned feeds
         prefs.feeds.saved = pref.saved
         prefs.feeds.pinned = pref.pinned
-      } else if (AppBskyActorDefs.isValidPersonalDetailsPref(pref)) {
+      } else if (predicate.isValidPersonalDetailsPref(pref)) {
         // birth date (irl)
         if (pref.birthDate) {
           prefs.birthDate = new Date(pref.birthDate)
         }
-      } else if (AppBskyActorDefs.isValidFeedViewPref(pref)) {
+      } else if (predicate.isValidFeedViewPref(pref)) {
         // feed view preferences
         const { $type: _, feed, ...v } = pref
         prefs.feedViewPrefs[feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v }
-      } else if (AppBskyActorDefs.isValidThreadViewPref(pref)) {
+      } else if (predicate.isValidThreadViewPref(pref)) {
         // thread view preferences
         const { $type: _, ...v } = pref
         prefs.threadViewPrefs = { ...prefs.threadViewPrefs, ...v }
-      } else if (AppBskyActorDefs.isValidInterestsPref(pref)) {
+      } else if (predicate.isValidInterestsPref(pref)) {
         const { $type: _, ...v } = pref
         prefs.interests = { ...prefs.interests, ...v }
-      } else if (AppBskyActorDefs.isValidMutedWordsPref(pref)) {
+      } else if (predicate.isValidMutedWordsPref(pref)) {
         prefs.moderationPrefs.mutedWords = pref.items
 
         if (prefs.moderationPrefs.mutedWords.length) {
@@ -628,9 +625,9 @@ export class Agent extends XrpcClient {
               return word
             })
         }
-      } else if (AppBskyActorDefs.isValidHiddenPostsPref(pref)) {
+      } else if (predicate.isValidHiddenPostsPref(pref)) {
         prefs.moderationPrefs.hiddenPosts = pref.items
-      } else if (AppBskyActorDefs.isValidBskyAppStatePref(pref)) {
+      } else if (predicate.isValidBskyAppStatePref(pref)) {
         prefs.bskyAppState.queuedNudges = pref.queuedNudges || []
         prefs.bskyAppState.activeProgressGuide = pref.activeProgressGuide
         prefs.bskyAppState.nuxs = pref.nuxs || []
@@ -837,7 +834,7 @@ export class Agent extends XrpcClient {
   async setAdultContentEnabled(v: boolean) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const adultContentPref = prefs.findLast(
-        AppBskyActorDefs.isValidAdultContentPref,
+        predicate.isValidAdultContentPref,
       ) || {
         $type: 'app.bsky.actor.defs#adultContentPref',
         enabled: v,
@@ -861,7 +858,7 @@ export class Agent extends XrpcClient {
     }
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const labelPref = prefs
-        .filter(AppBskyActorDefs.isValidContentLabelPref)
+        .filter(predicate.isValidContentLabelPref)
         .findLast(
           (pref) => pref.label === key && pref.labelerDid === labelerDid,
         ) || {
@@ -888,7 +885,7 @@ export class Agent extends XrpcClient {
           // if it's a legacy label, double-write the legacy label
           if (legacyLabelValue) {
             legacyLabelPref = prefs
-              .filter(AppBskyActorDefs.isValidContentLabelPref)
+              .filter(predicate.isValidContentLabelPref)
               .findLast(
                 (pref) =>
                   pref.label === legacyLabelValue &&
@@ -929,9 +926,7 @@ export class Agent extends XrpcClient {
   async addLabeler(did: string) {
     const prefs = await this.updatePreferences(
       (prefs: AppBskyActorDefs.Preferences) => {
-        const labelersPref = prefs.findLast(
-          AppBskyActorDefs.isValidLabelersPref,
-        ) || {
+        const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
           $type: 'app.bsky.actor.defs#labelersPref',
           labelers: [],
         }
@@ -952,9 +947,7 @@ export class Agent extends XrpcClient {
   async removeLabeler(did: string) {
     const prefs = await this.updatePreferences(
       (prefs: AppBskyActorDefs.Preferences) => {
-        const labelersPref = prefs.findLast(
-          AppBskyActorDefs.isValidLabelersPref,
-        ) || {
+        const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
           $type: 'app.bsky.actor.defs#labelersPref',
           labelers: [],
         }
@@ -980,7 +973,7 @@ export class Agent extends XrpcClient {
     birthDate = birthDate instanceof Date ? birthDate.toISOString() : birthDate
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const personalDetailsPref = prefs.findLast(
-        AppBskyActorDefs.isValidPersonalDetailsPref,
+        predicate.isValidPersonalDetailsPref,
       ) || {
         $type: 'app.bsky.actor.defs#personalDetailsPref',
         birthDate,
@@ -997,7 +990,7 @@ export class Agent extends XrpcClient {
   async setFeedViewPrefs(feed: string, pref: Partial<BskyFeedViewPreference>) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const existing = prefs
-        .filter(AppBskyActorDefs.isValidFeedViewPref)
+        .filter(predicate.isValidFeedViewPref)
         .findLast((pref) => pref.feed === feed)
 
       return prefs
@@ -1013,7 +1006,7 @@ export class Agent extends XrpcClient {
 
   async setThreadViewPrefs(pref: Partial<BskyThreadViewPreference>) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(AppBskyActorDefs.isValidThreadViewPref)
+      const existing = prefs.findLast(predicate.isValidThreadViewPref)
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isThreadViewPref(p))
@@ -1027,7 +1020,7 @@ export class Agent extends XrpcClient {
 
   async setInterestsPref(pref: Partial<BskyInterestsPreference>) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(AppBskyActorDefs.isValidInterestsPref)
+      const existing = prefs.findLast(predicate.isValidInterestsPref)
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isInterestsPref(p))
@@ -1053,9 +1046,7 @@ export class Agent extends XrpcClient {
     if (!sanitizedValue) return
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let mutedWordsPref = prefs.findLast(
-        AppBskyActorDefs.isValidMutedWordsPref,
-      )
+      let mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       const newMutedWord: AppBskyActorDefs.MutedWord = {
         id: TID.nextStr(),
@@ -1112,9 +1103,7 @@ export class Agent extends XrpcClient {
    */
   async updateMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const mutedWordsPref = prefs.findLast(
-        AppBskyActorDefs.isValidMutedWordsPref,
-      )
+      const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
         mutedWordsPref.items = mutedWordsPref.items.map((existingItem) => {
@@ -1162,9 +1151,7 @@ export class Agent extends XrpcClient {
    */
   async removeMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const mutedWordsPref = prefs.findLast(
-        AppBskyActorDefs.isValidMutedWordsPref,
-      )
+      const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
         for (let i = 0; i < mutedWordsPref.items.length; i++) {
@@ -1213,7 +1200,7 @@ export class Agent extends XrpcClient {
   async bskyAppQueueNudges(nudges: string | string[]) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1231,7 +1218,7 @@ export class Agent extends XrpcClient {
   async bskyAppDismissNudges(nudges: string | string[]) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1250,16 +1237,14 @@ export class Agent extends XrpcClient {
   async bskyAppSetActiveProgressGuide(
     guide: AppBskyActorDefs.BskyAppProgressGuide | undefined,
   ) {
-    if (
-      guide &&
-      !AppBskyActorDefs.validateBskyAppProgressGuide(guide).success
-    ) {
-      throw new Error('Invalid progress guide')
+    if (guide) {
+      const result = AppBskyActorDefs.validateBskyAppProgressGuide(guide)
+      if (!result.success) throw result.error
     }
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1280,7 +1265,7 @@ export class Agent extends XrpcClient {
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1321,7 +1306,7 @@ export class Agent extends XrpcClient {
   async bskyAppRemoveNuxs(ids: string[]) {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
       const bskyAppStatePref = prefs.findLast(
-        AppBskyActorDefs.isValidBskyAppStatePref,
+        predicate.isValidBskyAppStatePref,
       ) || {
         $type: 'app.bsky.actor.defs#bskyAppStatePref',
       }
@@ -1371,7 +1356,7 @@ export class Agent extends XrpcClient {
 
   private async updateHiddenPost(postUri: string, action: 'hide' | 'unhide') {
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const pref = prefs.findLast(AppBskyActorDefs.isValidHiddenPostsPref) || {
+      const pref = prefs.findLast(predicate.isValidHiddenPostsPref) || {
         $type: 'app.bsky.actor.defs#hiddenPostsPref',
         items: [],
       }
@@ -1400,9 +1385,7 @@ export class Agent extends XrpcClient {
   ): Promise<{ saved: string[]; pinned: string[] }> {
     let res
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const feedsPref = prefs.findLast(
-        AppBskyActorDefs.isValidSavedFeedsPref,
-      ) || {
+      const feedsPref = prefs.findLast(predicate.isValidSavedFeedsPref) || {
         $type: 'app.bsky.actor.defs#savedFeedsPref',
         saved: [],
         pinned: [],
@@ -1427,12 +1410,8 @@ export class Agent extends XrpcClient {
     let maybeMutatedSavedFeeds: AppBskyActorDefs.SavedFeed[] = []
 
     await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let existingV2Pref = prefs.findLast(
-        AppBskyActorDefs.isValidSavedFeedsPrefV2,
-      )
-      let existingV1Pref = prefs.findLast(
-        AppBskyActorDefs.isValidSavedFeedsPref,
-      )
+      let existingV2Pref = prefs.findLast(predicate.isValidSavedFeedsPrefV2)
+      let existingV1Pref = prefs.findLast(predicate.isValidSavedFeedsPref)
 
       if (existingV2Pref) {
         maybeMutatedSavedFeeds = cb(existingV2Pref.items)
@@ -1533,7 +1512,7 @@ function remapLegacyLabels(
 function prefsArrayToLabelerDids(
   prefs: AppBskyActorDefs.Preferences,
 ): string[] {
-  const labelersPref = prefs.findLast(AppBskyActorDefs.isValidLabelersPref)
+  const labelersPref = prefs.findLast(predicate.isValidLabelersPref)
   let dids: string[] = []
   if (labelersPref) {
     dids = (labelersPref as AppBskyActorDefs.LabelersPref).labelers.map(

package/src/client/index.ts

@@ -4,7 +4,7 @@
 import { XrpcClient, FetchHandler, FetchHandlerOptions } from '@atproto/xrpc'
 import { schemas } from './lexicons'
 import { CID } from 'multiformats/cid'
-import { OmitKey } from './util'
+import { OmitKey, Un$Typed } from './util'
 import * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
 import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
 import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
@@ -1636,7 +1636,7 @@ export class ProfileRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyActorProfile.Record,
+    record: Un$Typed<AppBskyActorProfile.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.actor.profile'
@@ -1924,7 +1924,7 @@ export class GeneratorRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedGenerator.Record,
+    record: Un$Typed<AppBskyFeedGenerator.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.feed.generator'
@@ -1985,7 +1985,7 @@ export class LikeRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedLike.Record,
+    record: Un$Typed<AppBskyFeedLike.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.feed.like'
@@ -2046,7 +2046,7 @@ export class PostRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedPost.Record,
+    record: Un$Typed<AppBskyFeedPost.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.feed.post'
@@ -2107,7 +2107,7 @@ export class PostgateRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedPostgate.Record,
+    record: Un$Typed<AppBskyFeedPostgate.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.feed.postgate'
@@ -2168,7 +2168,7 @@ export class RepostRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedRepost.Record,
+    record: Un$Typed<AppBskyFeedRepost.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.feed.repost'
@@ -2233,7 +2233,7 @@ export class ThreadgateRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedThreadgate.Record,
+    record: Un$Typed<AppBskyFeedThreadgate.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.feed.threadgate'
@@ -2535,7 +2535,7 @@ export class BlockRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphBlock.Record,
+    record: Un$Typed<AppBskyGraphBlock.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.graph.block'
@@ -2596,7 +2596,7 @@ export class FollowRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphFollow.Record,
+    record: Un$Typed<AppBskyGraphFollow.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.graph.follow'
@@ -2657,7 +2657,7 @@ export class ListRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphList.Record,
+    record: Un$Typed<AppBskyGraphList.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.graph.list'
@@ -2722,7 +2722,7 @@ export class ListblockRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphListblock.Record,
+    record: Un$Typed<AppBskyGraphListblock.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.graph.listblock'
@@ -2783,7 +2783,7 @@ export class ListitemRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphListitem.Record,
+    record: Un$Typed<AppBskyGraphListitem.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.graph.listitem'
@@ -2848,7 +2848,7 @@ export class StarterpackRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphStarterpack.Record,
+    record: Un$Typed<AppBskyGraphStarterpack.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.graph.starterpack'
@@ -2935,7 +2935,7 @@ export class ServiceRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyLabelerService.Record,
+    record: Un$Typed<AppBskyLabelerService.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'app.bsky.labeler.service'
@@ -3284,7 +3284,7 @@ export class DeclarationRecord {
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: ChatBskyActorDeclaration.Record,
+    record: Un$Typed<ChatBskyActorDeclaration.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
     const collection = 'chat.bsky.actor.declaration'

package/src/client/lexicons.ts

@@ -13621,31 +13621,46 @@ export const schemaDict = {
 export const schemas = Object.values(schemaDict) satisfies LexiconDoc[]
 export const lexicons: Lexicons = new Lexicons(schemas)
 
-export function validate<V>(v: unknown, id: string, hash: string) {
-  return (
-    maybe$typed(v, id, hash)
-      ? lexicons.validate(`${id}#${hash}`, v)
-      : {
-          success: false,
-          error: new ValidationError(
-            `Must be an object with "${id}#${hash}" $type property`,
-          ),
-        }
-  ) as ValidationResult<V>
+export function validate<T extends { $type: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType: true,
+): ValidationResult<T>
+export function validate<T extends { $type?: string }>(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: false,
+): ValidationResult<T>
+export function validate(
+  v: unknown,
+  id: string,
+  hash: string,
+  requiredType?: boolean,
+): ValidationResult {
+  return (requiredType ? is$typed : maybe$typed)(v, id, hash)
+    ? lexicons.validate(`${id}#${hash}`, v)
+    : {
+        success: false,
+        error: new ValidationError(
+          `Must be an object with "${hash === 'main' ? id : `${id}#${hash}`}" $type property`,
+        ),
+      }
 }
 
-export function isValid<V extends { $type?: string }>(
+export function isValid<T extends { $type: string }>(
   v: unknown,
   id: string,
   hash: string,
   requiredType: true,
-): v is $Typed<V>
-export function isValid<V extends { $type?: string }>(
+): v is T
+export function isValid<T extends { $type?: string }>(
   v: unknown,
   id: string,
   hash: string,
-  requiredType?: boolean,
-): v is V
+  requiredType?: false,
+): v is T
 export function isValid(
   v: unknown,
   id: string,