SDK@next migration

package.json

@@ -54,7 +54,7 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.13.21",
+    "@atproto/api": "0.14.0-next.1",
     "@braintree/sanitize-url": "^6.0.2",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
     "@emoji-mart/react": "^1.1.1",

src/components/MediaPreview.tsx

@@ -6,6 +6,7 @@ import {
   AppBskyEmbedImages,
   AppBskyEmbedRecordWithMedia,
   AppBskyEmbedVideo,
+  AppBskyFeedDefs,
 } from '@atproto/api'
 import {Trans} from '@lingui/macro'
 
@@ -22,17 +23,12 @@ export function Embed({
   embed,
   style,
 }: {
-  embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedRecordWithMedia.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedVideo.View
-    | {[k: string]: unknown}
+  embed?: AppBskyFeedDefs.PostView['embed']
   style?: StyleProp<ViewStyle>
 }) {
   let media = AppBskyEmbedRecordWithMedia.isView(embed) ? embed.media : embed
 
-  if (AppBskyEmbedImages.isView(media)) {
+  if (AppBskyEmbedImages.isValidView(media)) {
     return (
       <Outer style={style}>
         {media.images.map(image => (
@@ -44,7 +40,7 @@ export function Embed({
         ))}
       </Outer>
     )
-  } else if (AppBskyEmbedExternal.isView(media) && media.external.thumb) {
+  } else if (AppBskyEmbedExternal.isValidView(media) && media.external.thumb) {
     let url: URL | undefined
     try {
       url = new URL(media.external.uri)
@@ -62,7 +58,7 @@ export function Embed({
         )
       }
     }
-  } else if (AppBskyEmbedVideo.isView(media)) {
+  } else if (AppBskyEmbedVideo.isValidView(media)) {
     return (
       <Outer style={style}>
         <VideoItem thumbnail={media.thumbnail} alt={media.alt} />

src/screens/StarterPack/Wizard/State.tsx

@@ -126,7 +126,10 @@ export function Provider({
   const {currentAccount} = useSession()
 
   const createInitialState = (): State => {
-    if (starterPack && AppBskyGraphStarterpack.isRecord(starterPack.record)) {
+    if (
+      starterPack &&
+      AppBskyGraphStarterpack.isValidRecord(starterPack.record)
+    ) {
       return {
         canNext: true,
         currentStep: 'Details',

src/state/cache/profile-shadow.ts

@@ -35,7 +35,7 @@ const shadows: WeakMap<
 const emitter = new EventEmitter()
 
 export function useProfileShadow<
-  TProfileView extends AppBskyActorDefs.ProfileView,
+  TProfileView extends Omit<AppBskyActorDefs.ProfileView, '$type'>,
 >(profile: TProfileView): Shadow<TProfileView> {
   const [shadow, setShadow] = useState(() => shadows.get(profile))
   const [prevPost, setPrevPost] = useState(profile)

src/state/queries/notifications/feed.ts

@@ -295,9 +295,11 @@ export function* findAllPostsInQueryData(
           }
         }
 
-        const quotedPost = getEmbeddedPost(item.subject?.embed)
-        if (quotedPost && didOrHandleUriMatches(atUri, quotedPost)) {
-          yield embedViewRecordToPostView(quotedPost!)
+        if (AppBskyFeedDefs.isPostView(item.subject)) {
+          const quotedPost = getEmbeddedPost(item.subject?.embed)
+          if (quotedPost && didOrHandleUriMatches(atUri, quotedPost)) {
+            yield embedViewRecordToPostView(quotedPost!)
+          }
         }
       }
     }
@@ -307,7 +309,7 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<AppBskyActorDefs.ProfileViewBasic, void> {
   const queryDatas = queryClient.getQueriesData<InfiniteData<FeedPage>>({
     queryKey: [RQKEY_ROOT],
   })
@@ -323,9 +325,11 @@ export function* findAllProfilesInQueryData(
         ) {
           yield item.subject.author
         }
-        const quotedPost = getEmbeddedPost(item.subject?.embed)
-        if (quotedPost?.author.did === did) {
-          yield quotedPost.author
+        if (AppBskyFeedDefs.isPostView(item.subject)) {
+          const quotedPost = getEmbeddedPost(item.subject?.embed)
+          if (quotedPost?.author.did === did) {
+            yield quotedPost.author
+          }
         }
       }
     }

src/state/queries/notifications/util.ts

@@ -255,8 +255,8 @@ function getSubjectUri(
     return notif.uri
   } else if (type === 'post-like' || type === 'repost') {
     if (
-      AppBskyFeedRepost.isRecord(notif.record) ||
-      AppBskyFeedLike.isRecord(notif.record)
+      AppBskyFeedRepost.isValidRecord(notif.record) ||
+      AppBskyFeedLike.isValidRecord(notif.record)
     ) {
       return typeof notif.record.subject?.uri === 'string'
         ? notif.record.subject?.uri

src/state/queries/post-feed.ts

@@ -543,7 +543,7 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, undefined> {
+): Generator<AppBskyActorDefs.ProfileViewBasic, undefined> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<FeedPageUnselected>
   >({

src/state/queries/post-quotes.ts

@@ -70,7 +70,7 @@ export function usePostQuotesQuery(resolvedUri: string | undefined) {
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<AppBskyActorDefs.ProfileViewBasic, void> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<AppBskyFeedGetQuotes.OutputSchema>
   >({

src/state/queries/post-thread.ts

@@ -329,8 +329,7 @@ function responseToThreadNodes(
 ): ThreadNode {
   if (
     AppBskyFeedDefs.isThreadViewPost(node) &&
-    AppBskyFeedPost.isRecord(node.post.record) &&
-    AppBskyFeedPost.validateRecord(node.post.record).success
+    AppBskyFeedPost.isValidRecord(node.post.record)
   ) {
     const post = node.post
     // These should normally be present. They're missing only for
@@ -360,7 +359,7 @@ function responseToThreadNodes(
         depth,
         isHighlightedPost: depth === 0,
         hasMore:
-          direction === 'down' && !node.replies?.length && !!node.replyCount,
+          direction === 'down' && !node.replies?.length && !!post.replyCount,
         isSelfThread: false, // populated `annotateSelfThread`
         hasMoreSelfThread: false, // populated in `annotateSelfThread`
       },
@@ -493,7 +492,10 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, void> {
+): Generator<
+  AppBskyActorDefs.ProfileView | AppBskyActorDefs.ProfileViewBasic,
+  void
+> {
   const queryDatas = queryClient.getQueriesData<PostThreadQueryData>({
     queryKey: [RQKEY_ROOT],
   })

src/state/queries/postgate/index.ts

@@ -60,7 +60,7 @@ export async function getPostgateRecord({
         }),
     )
 
-    if (data.value && AppBskyFeedPostgate.isRecord(data.value)) {
+    if (data.value && AppBskyFeedPostgate.isValidRecord(data.value)) {
       return data.value
     } else {
       return undefined

src/state/queries/postgate/util.ts

@@ -5,6 +5,7 @@ import {
   AppBskyFeedPostgate,
   AtUri,
 } from '@atproto/api'
+import {$Typed} from '@atproto/api/dist/client/util'
 
 export const POSTGATE_COLLECTION = 'app.bsky.feed.postgate'
 
@@ -45,8 +46,12 @@ export function mergePostgateRecords(
   })
 }
 
-export function createEmbedViewDetachedRecord({uri}: {uri: string}) {
-  const record: AppBskyEmbedRecord.ViewDetached = {
+export function createEmbedViewDetachedRecord({
+  uri,
+}: {
+  uri: string
+}): $Typed<AppBskyEmbedRecord.View> {
+  const record: $Typed<AppBskyEmbedRecord.ViewDetached> = {
     $type: 'app.bsky.embed.record#viewDetached',
     uri,
     detached: true,
@@ -95,7 +100,7 @@ export function createMaybeDetachedQuoteEmbed({
 
 export function createEmbedViewRecordFromPost(
   post: AppBskyFeedDefs.PostView,
-): AppBskyEmbedRecord.ViewRecord {
+): $Typed<AppBskyEmbedRecord.ViewRecord> {
   return {
     $type: 'app.bsky.embed.record#viewRecord',
     uri: post.uri,

src/state/queries/profile.ts

@@ -73,7 +73,7 @@ export function useProfileQuery({
     placeholderData: () => {
       if (!did) return
 
-      return queryClient.getQueryData<AppBskyActorDefs.ProfileViewBasic>(
+      return queryClient.getQueryData<AppBskyActorDefs.ProfileViewDetailed>(
         profileBasicQueryKey(did),
       )
     },
@@ -113,7 +113,7 @@ export function usePrefetchProfileQuery() {
 }
 
 interface ProfileUpdateParams {
-  profile: AppBskyActorDefs.ProfileView
+  profile: AppBskyActorDefs.ProfileViewDetailed
   updates:
     | AppBskyActorProfile.Record
     | ((existing: AppBskyActorProfile.Record) => AppBskyActorProfile.Record)
@@ -220,7 +220,7 @@ export function useProfileUpdateMutation() {
 }
 
 export function useProfileFollowMutationQueue(
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>,
+  profile: Shadow<Omit<AppBskyActorDefs.ProfileViewDetailed, '$type'>>,
   logContext: LogEvents['profile:follow']['logContext'] &
     LogEvents['profile:follow']['logContext'],
 ) {
@@ -294,7 +294,7 @@ export function useProfileFollowMutationQueue(
 
 function useProfileFollowMutation(
   logContext: LogEvents['profile:follow']['logContext'],
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>,
+  profile: Shadow<Omit<AppBskyActorDefs.ProfileViewDetailed, '$type'>>,
 ) {
   const {currentAccount} = useSession()
   const agent = useAgent()
@@ -334,7 +334,7 @@ function useProfileUnfollowMutation(
 }
 
 export function useProfileMuteMutationQueue(
-  profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>,
+  profile: Shadow<Omit<AppBskyActorDefs.ProfileViewDetailed, '$type'>>,
 ) {
   const queryClient = useQueryClient()
   const did = profile.did
@@ -409,7 +409,7 @@ function useProfileUnmuteMutation() {
 }
 
 export function useProfileBlockMutationQueue(
-  profile: Shadow<AppBskyActorDefs.ProfileViewBasic>,
+  profile: Shadow<Omit<AppBskyActorDefs.ProfileViewBasic, '$type'>>,
 ) {
   const queryClient = useQueryClient()
   const did = profile.did

src/state/queries/search-posts.ts

@@ -174,7 +174,10 @@ export function* findAllPostsInQueryData(
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
-): Generator<AppBskyActorDefs.ProfileView, undefined> {
+): Generator<
+  AppBskyActorDefs.ProfileView | AppBskyActorDefs.ProfileViewBasic,
+  undefined
+> {
   const queryDatas = queryClient.getQueriesData<
     InfiniteData<AppBskyFeedSearchPosts.OutputSchema>
   >({

src/state/queries/service-config.ts

@@ -19,6 +19,7 @@ export function useServiceConfigQuery() {
         const {data} = await agent.api.app.bsky.unspecced.getConfig()
         return {
           checkEmailConfirmed: Boolean(data.checkEmailConfirmed),
+          // @ts-expect-error TODO migrate once updated
           topicsEnabled: Boolean(data.topicsEnabled),
         }
       } catch (e) {

src/state/queries/starter-packs.ts

@@ -131,7 +131,7 @@ export function useCreateStarterPackMutation({
 
       return await agent.app.bsky.graph.starterpack.create(
         {
-          repo: agent.session?.did,
+          repo: agent.session?.did!,
         },
         {
           name,
@@ -366,7 +366,10 @@ export async function precacheStarterPack(
   let starterPackView: AppBskyGraphDefs.StarterPackView | undefined
   if (AppBskyGraphDefs.isStarterPackView(starterPack)) {
     starterPackView = starterPack
-  } else if (AppBskyGraphDefs.isStarterPackViewBasic(starterPack)) {
+  } else if (
+    AppBskyGraphDefs.isStarterPackViewBasic(starterPack) &&
+    AppBskyGraphStarterpack.isValidRecord(starterPack.record)
+  ) {
     const listView: AppBskyGraphDefs.ListViewBasic = {
       uri: starterPack.record.list,
       // This will be populated once the data from server is fetched

src/state/queries/threadgate/index.ts

@@ -138,7 +138,7 @@ export async function getThreadgateRecord({
         }),
     )
 
-    if (data.value && AppBskyFeedThreadgate.isRecord(data.value)) {
+    if (data.value && AppBskyFeedThreadgate.isValidRecord(data.value)) {
       return data.value
     } else {
       return null

src/state/queries/threadgate/types.ts

@@ -3,4 +3,4 @@ export type ThreadgateAllowUISetting =
   | {type: 'nobody'}
   | {type: 'mention'}
   | {type: 'following'}
-  | {type: 'list'; list: unknown}
+  | {type: 'list'; list: string}

src/state/queries/threadgate/util.ts

@@ -6,9 +6,7 @@ export function threadgateViewToAllowUISetting(
   threadgateView: AppBskyFeedDefs.ThreadgateView | undefined,
 ): ThreadgateAllowUISetting[] {
   const threadgate =
-    threadgateView &&
-    AppBskyFeedThreadgate.isRecord(threadgateView.record) &&
-    AppBskyFeedThreadgate.validateRecord(threadgateView.record).success
+    threadgateView && AppBskyFeedThreadgate.isValidRecord(threadgateView.record)
       ? threadgateView.record
       : undefined
   return threadgateRecordToAllowUISetting(threadgate)
@@ -39,11 +37,11 @@ export function threadgateRecordToAllowUISetting(
   const settings: ThreadgateAllowUISetting[] = threadgate.allow
     .map(allow => {
       let setting: ThreadgateAllowUISetting | undefined
-      if (allow.$type === 'app.bsky.feed.threadgate#mentionRule') {
+      if (AppBskyFeedThreadgate.isValidMentionRule(allow)) {
         setting = {type: 'mention'}
-      } else if (allow.$type === 'app.bsky.feed.threadgate#followingRule') {
+      } else if (AppBskyFeedThreadgate.isValidFollowingRule(allow)) {
         setting = {type: 'following'}
-      } else if (allow.$type === 'app.bsky.feed.threadgate#listRule') {
+      } else if (AppBskyFeedThreadgate.isValidListRule(allow)) {
         setting = {type: 'list', list: allow.list}
       }
       return setting
@@ -67,11 +65,7 @@ export function threadgateAllowUISettingToAllowRecordValue(
     return undefined
   }
 
-  let allow: (
-    | AppBskyFeedThreadgate.MentionRule
-    | AppBskyFeedThreadgate.FollowingRule
-    | AppBskyFeedThreadgate.ListRule
-  )[] = []
+  let allow: Exclude<AppBskyFeedThreadgate.Record['allow'], undefined> = []
 
   if (!threadgate.find(v => v.type === 'nobody')) {
     for (const rule of threadgate) {

src/state/queries/util.ts

@@ -44,15 +44,15 @@ export function didOrHandleUriMatches(
 export function getEmbeddedPost(
   v: unknown,
 ): AppBskyEmbedRecord.ViewRecord | undefined {
-  if (AppBskyEmbedRecord.isView(v)) {
+  if (AppBskyEmbedRecord.isValidView(v)) {
     if (
       AppBskyEmbedRecord.isViewRecord(v.record) &&
       AppBskyFeedPost.isRecord(v.record.value)
     ) {
       return v.record
     }
   }
-  if (AppBskyEmbedRecordWithMedia.isView(v)) {
+  if (AppBskyEmbedRecordWithMedia.isValidView(v)) {
     if (
       AppBskyEmbedRecord.isViewRecord(v.record.record) &&
       AppBskyFeedPost.isRecord(v.record.record.value)