@atproto/api 0.13.19 → 0.14.0-next.0

package/src/client/types/chat/bsky/convo/leaveConvo.ts

@@ -3,21 +3,21 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/chat/bsky/convo/listConvos.ts

@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
@@ -18,7 +20,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/chat/bsky/convo/muteConvo.ts

@@ -3,21 +3,21 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/chat/bsky/convo/sendMessage.ts

@@ -3,17 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView

package/src/client/types/chat/bsky/convo/sendMessageBatch.ts

@@ -3,21 +3,21 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -38,19 +38,19 @@ export function toKnownErr(e: any) {
 }
 
 export interface BatchItem {
+  $type?: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, 'batchItem')
+}
+
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function isValidBatchItem<V>(v: V): v is V & $Typed<BatchItem> {
+  return isBatchItem(v) && validateBatchItem(v).success
 }

package/src/client/types/chat/bsky/convo/unmuteConvo.ts

@@ -3,21 +3,21 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/chat/bsky/convo/updateRead.ts

@@ -3,22 +3,22 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/chat/bsky/moderation/getActorMetadata.ts

@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
   actor: string
@@ -17,7 +19,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -36,21 +37,21 @@ export function toKnownErr(e: any) {
 }
 
 export interface Metadata {
+  $type?: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, 'metadata')
+}
+
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function isValidMetadata<V>(v: V): v is V & $Typed<Metadata> {
+  return isMetadata(v) && validateMetadata(v).success
 }

package/src/client/types/chat/bsky/moderation/getMessageContext.ts

@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ChatBskyConvoDefs from '../convo/defs'
 
+const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
@@ -20,11 +22,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/chat/bsky/moderation/updateActorAccess.ts

@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
 
@@ -13,7 +15,6 @@ export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/defs.ts

@@ -2,34 +2,40 @@
  * 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 ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
+  $type?: $Type<'com.atproto.admin.defs', 'statusAttr'>
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
+}
+
+export function isValidStatusAttr<V>(v: V): v is V & $Typed<StatusAttr> {
+  return isStatusAttr(v) && validateStatusAttr(v).success
 }
 
 export interface AccountView {
+  $type?: $Type<'com.atproto.admin.defs', 'accountView'>
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -38,71 +44,81 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, 'accountView')
+}
+
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function isValidAccountView<V>(v: V): v is V & $Typed<AccountView> {
+  return isAccountView(v) && validateAccountView(v).success
 }
 
 export interface RepoRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoRef'>
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
+}
+
+export function isValidRepoRef<V>(v: V): v is V & $Typed<RepoRef> {
+  return isRepoRef(v) && validateRepoRef(v).success
 }
 
 export interface RepoBlobRef {
+  $type?: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, 'repoBlobRef')
+}
+
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function isValidRepoBlobRef<V>(v: V): v is V & $Typed<RepoBlobRef> {
+  return isRepoBlobRef(v) && validateRepoBlobRef(v).success
 }
 
 export interface ThreatSignature {
+  $type?: $Type<'com.atproto.admin.defs', 'threatSignature'>
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, 'threatSignature')
+}
+
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function isValidThreatSignature<V>(
+  v: V,
+): v is V & $Typed<ThreatSignature> {
+  return isThreatSignature(v) && validateThreatSignature(v).success
 }

package/src/client/types/com/atproto/admin/deleteAccount.ts

@@ -3,15 +3,16 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/disableAccountInvites.ts

@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
 
@@ -13,7 +15,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/disableInviteCodes.ts

@@ -3,16 +3,17 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/enableAccountInvites.ts

@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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'
+
+const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
 
@@ -13,7 +15,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/getAccountInfo.ts

@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }

package/src/client/types/com/atproto/admin/getAccountInfos.ts

@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
@@ -16,7 +18,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/getInviteCodes.ts

@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 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 ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort?: 'recent' | 'usage' | (string & {})
   limit?: number
@@ -19,7 +21,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {