@atproto/api 0.13.20 → 0.14.0-next.0

package/src/client/types/app/bsky/embed/record.ts

@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, $Typed, is$typed, OmitKey } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,134 +16,149 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+const id = 'app.bsky.embed.record'
+
 export interface Main {
+  $type?: $Type<'app.bsky.embed.record', 'main'>
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain<V>(v: V) {
+  return is$typed(v, id, 'main')
+}
+
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function isValidMain<V>(v: V): v is V & $Typed<Main> {
+  return isMain(v) && validateMain(v).success
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.record', 'view'>
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
+}
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, 'view')
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function isValidView<V>(v: V): v is V & $Typed<View> {
+  return isView(v) && validateView(v).success
 }
 
 export interface ViewRecord {
+  $type?: $Type<'app.bsky.embed.record', 'viewRecord'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
+}
+
+export function isValidViewRecord<V>(v: V): v is V & $Typed<ViewRecord> {
+  return isViewRecord(v) && validateViewRecord(v).success
 }
 
 export interface ViewNotFound {
+  $type?: $Type<'app.bsky.embed.record', 'viewNotFound'>
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, 'viewNotFound')
+}
+
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function isValidViewNotFound<V>(v: V): v is V & $Typed<ViewNotFound> {
+  return isViewNotFound(v) && validateViewNotFound(v).success
 }
 
 export interface ViewBlocked {
+  $type?: $Type<'app.bsky.embed.record', 'viewBlocked'>
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
+}
+
+export function isValidViewBlocked<V>(v: V): v is V & $Typed<ViewBlocked> {
+  return isViewBlocked(v) && validateViewBlocked(v).success
 }
 
 export interface ViewDetached {
+  $type?: $Type<'app.bsky.embed.record', 'viewDetached'>
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, 'viewDetached')
+}
+
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function isValidViewDetached<V>(v: V): v is V & $Typed<ViewDetached> {
+  return isViewDetached(v) && validateViewDetached(v).success
 }

package/src/client/types/app/bsky/embed/recordWithMedia.ts

@@ -2,55 +2,56 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, $Typed, is$typed, OmitKey } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'main'>
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain<V>(v: V) {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
+}
+
+export function isValidMain<V>(v: V): v is V & $Typed<Main> {
+  return isMain(v) && validateMain(v).success
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.recordWithMedia', 'view'>
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
+}
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, 'view')
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function isValidView<V>(v: V): v is V & $Typed<View> {
+  return isView(v) && validateView(v).success
 }

package/src/client/types/app/bsky/embed/video.ts

@@ -2,66 +2,69 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, $Typed, is$typed, OmitKey } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.video'
+
 export interface Main {
+  $type?: $Type<'app.bsky.embed.video', 'main'>
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain<V>(v: V) {
+  return is$typed(v, id, 'main')
+}
+
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function isValidMain<V>(v: V): v is V & $Typed<Main> {
+  return isMain(v) && validateMain(v).success
 }
 
 export interface Caption {
+  $type?: $Type<'app.bsky.embed.video', 'caption'>
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
+}
+
+export function isValidCaption<V>(v: V): v is V & $Typed<Caption> {
+  return isCaption(v) && validateCaption(v).success
 }
 
 export interface View {
+  $type?: $Type<'app.bsky.embed.video', 'view'>
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView<V>(v: V) {
+  return is$typed(v, id, 'view')
+}
+
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function isValidView<V>(v: V): v is V & $Typed<View> {
+  return isView(v) && validateView(v).success
 }