@atproto/api 0.13.21 → 0.14.0-next.1

package/src/client/types/app/bsky/labeler/defs.ts

@@ -2,13 +2,22 @@
  * 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 * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerView'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -16,22 +25,24 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
+}
+
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function isValidLabelerView<V>(v: V) {
+  return isValid<LabelerView>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -40,54 +51,59 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
+}
+
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function isValidLabelerViewDetailed<V>(v: V) {
+  return isValid<LabelerViewDetailed>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
+}
+
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function isValidLabelerViewerState<V>(v: V) {
+  return isValid<LabelerViewerState>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
+}
+
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function isValidLabelerPolicies<V>(v: V) {
+  return isValid<LabelerPolicies>(v, id, hashLabelerPolicies)
 }

package/src/client/types/app/bsky/labeler/getServices.ts

@@ -3,10 +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 * as AppBskyLabelerDefs from './defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
   dids: string[]
@@ -17,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/app/bsky/labeler/service.ts

@@ -2,30 +2,38 @@
  * 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 * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type?: $Type<'app.bsky.labeler.service', 'main'>
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function isValidRecord<V>(v: V) {
+  return isValid<Record>(v, id, hashRecord, true)
 }

package/src/client/types/app/bsky/notification/getUnreadCount.ts

@@ -3,9 +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 {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
   priority?: boolean
@@ -16,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/app/bsky/notification/listNotifications.ts

@@ -3,11 +3,19 @@
  */
 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 * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
   /** Notification reasons to include in response. */
@@ -25,7 +33,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -44,6 +51,7 @@ export function toKnownErr(e: any) {
 }
 
 export interface Notification {
+  $type?: $Type<'app.bsky.notification.listNotifications', 'notification'>
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -58,24 +66,22 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
+}
+
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
-    v,
-  )
+export function isValidNotification<V>(v: V) {
+  return isValid<Notification>(v, id, hashNotification)
 }

package/src/client/types/app/bsky/notification/putPreferences.ts

@@ -3,15 +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 {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/app/bsky/notification/registerPush.ts

@@ -3,9 +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 {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
 
@@ -14,7 +22,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/app/bsky/notification/updateSeen.ts

@@ -3,15 +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 {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/app/bsky/richtext/facet.ts

@@ -2,97 +2,116 @@
  * 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 {
+  isValid as _isValid,
+  validate as _validate,
+} from '../../../../lexicons'
+import { $Type, $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  isValid = _isValid,
+  validate = _validate
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: $Type<'app.bsky.richtext.facet', 'main'>
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
+}
+
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function isValidMain<V>(v: V) {
+  return isValid<Main>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: $Type<'app.bsky.richtext.facet', 'mention'>
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
+}
+
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function isValidMention<V>(v: V) {
+  return isValid<Mention>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: $Type<'app.bsky.richtext.facet', 'link'>
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
+}
+
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function isValidLink<V>(v: V) {
+  return isValid<Link>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: $Type<'app.bsky.richtext.facet', 'tag'>
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
+}
+
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function isValidTag<V>(v: V) {
+  return isValid<Tag>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: $Type<'app.bsky.richtext.facet', 'byteSlice'>
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
+}
+
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function isValidByteSlice<V>(v: V) {
+  return isValid<ByteSlice>(v, id, hashByteSlice)
 }