@atproto/ozone 0.1.77 → 0.1.79

package/src/lexicon/types/tools/ozone/setting/listOptions.ts

@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
   limit: number
@@ -24,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined

package/src/lexicon/types/tools/ozone/setting/removeOptions.ts

@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'

package/src/lexicon/types/tools/ozone/setting/upsertOption.ts

@@ -3,30 +3,32 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface HandlerInput {

package/src/lexicon/types/tools/ozone/signature/defs.ts

@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: 'tools.ozone.signature.defs#sigDetail'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }

package/src/lexicon/types/tools/ozone/signature/findCorrelation.ts

@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
   dids: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined

package/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts

@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
   did: string
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -51,22 +54,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RelatedAccount {
+  $type?: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
-    v,
-  )
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }

package/src/lexicon/types/tools/ozone/signature/searchAccounts.ts

@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
   values: string[]
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined

package/src/lexicon/types/tools/ozone/team/addMember.ts

@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
 
@@ -18,7 +22,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member

package/src/lexicon/types/tools/ozone/team/defs.ts

@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: 'tools.ozone.team.defs#member'
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -19,24 +24,21 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`

package/src/lexicon/types/tools/ozone/team/deleteMember.ts

@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {

package/src/lexicon/types/tools/ozone/team/listMembers.ts

@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined

package/src/lexicon/types/tools/ozone/team/updateMember.ts

@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
 
@@ -19,7 +23,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member

package/src/lexicon/util.ts

@@ -1,13 +1,82 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+
+import { ValidationResult } from '@atproto/lexicon'
+
+export type OmitKey<T, K extends keyof T> = {
+  [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+export type $Typed<V, T extends string = string> = V & { $type: T }
+export type Un$Typed<V extends { $type?: string }> = OmitKey<V, '$type'>
+
+export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
+  ? Id
+  : `${Id}#${Hash}`
+
+function isObject<V>(v: V): v is V & object {
+  return v != null && typeof v === 'object'
+}
+
+function is$type<Id extends string, Hash extends string>(
+  $type: unknown,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return hash === 'main'
+    ? $type === id
+    : // $type === `${id}#${hash}`
+      typeof $type === 'string' &&
+        $type.length === id.length + 1 + hash.length &&
+        $type.charCodeAt(id.length) === 35 /* '#' */ &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash)
+}
+
+export type $TypedObject<
+  V,
+  Id extends string,
+  Hash extends string,
+> = V extends {
+  $type: $Type<Id, Hash>
+}
+  ? V
+  : V extends { $type?: string }
+    ? V extends { $type?: infer T extends $Type<Id, Hash> }
+      ? V & { $type: T }
+      : never
+    : V & { $type: $Type<Id, Hash> }
+
+export function is$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is $TypedObject<V, Id, Hash> {
+  return isObject(v) && '$type' in v && is$type(v.$type, id, hash)
+}
+
+export function maybe$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type?: $Type<Id, Hash> } {
+  return (
+    isObject(v) &&
+    ('$type' in v ? v.$type === undefined || is$type(v.$type, id, hash) : true)
+  )
+}
+
+export type Validator<R = unknown> = (v: unknown) => ValidationResult<R>
+export type ValidatorParam<V extends Validator> =
+  V extends Validator<infer R> ? R : never
+
+/**
+ * Utility function that allows to convert a "validate*" utility function into a
+ * type predicate.
+ */
+export function asPredicate<V extends Validator>(validate: V) {
+  return function <T>(v: T): v is T & ValidatorParam<V> {
+    return validate(v).success
+  }
 }

package/src/mod-service/index.ts

@@ -21,6 +21,7 @@ import { ImageInvalidator } from '../image-invalidator'
 import { ids } from '../lexicon/lexicons'
 import { RepoBlobRef, RepoRef } from '../lexicon/types/com/atproto/admin/defs'
 import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { ReasonType } from '../lexicon/types/com/atproto/moderation/defs'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
 import {
   REVIEWESCALATED,
@@ -471,7 +472,11 @@ export class ModerationService {
     const modEvent = await this.db.db
       .insertInto('moderation_event')
       .values({
-        comment: event.comment ? `${event.comment}` : null,
+        comment:
+          ('comment' in event &&
+            typeof event.comment === 'string' &&
+            event.comment) ||
+          null,
         action: event.$type as ModerationEvent['action'],
         createdAt: createdAt.toISOString(),
         createdBy,
@@ -479,9 +484,10 @@ export class ModerationService {
         negateLabelVals,
         addedTags,
         removedTags,
-        durationInHours: event.durationInHours
-          ? Number(event.durationInHours)
-          : null,
+        durationInHours:
+          'durationInHours' in event && event.durationInHours
+            ? Number(event.durationInHours)
+            : null,
         meta: Object.assign(meta, subjectInfo.meta),
         expiresAt:
           (isModEventTakedown(event) || isModEventMute(event)) &&
@@ -783,7 +789,7 @@ export class ModerationService {
   }
 
   async report(info: {
-    reasonType: NonNullable<ModerationEventRow['meta']>['reportType']
+    reasonType: ReasonType
     reason?: string
     subject: ModSubject
     reportedBy: string

package/src/mod-service/subject.ts

@@ -1,44 +1,50 @@
 import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
-import { RepoRef } from '../lexicon/types/com/atproto/admin/defs'
+import * as ChatBskyConvoDefs from '../lexicon/types/chat/bsky/convo/defs'
+import { RepoRef, isRepoRef } from '../lexicon/types/com/atproto/admin/defs'
 import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
+import * as ComAtprotoRepoStrongRef from '../lexicon/types/com/atproto/repo/strongRef'
 import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
+import { $Typed, asPredicate } from '../lexicon/util'
 import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 
 type SubjectInput = ReportInput['subject'] | ActionInput['subject']
 
+type StrongRef = ComAtprotoRepoStrongRef.Main
+const isStrongRef = asPredicate(ComAtprotoRepoStrongRef.validateMain)
+
+type MessageRef = ChatBskyConvoDefs.MessageRef
+const isValidMessageRef = asPredicate(ChatBskyConvoDefs.validateMessageRef)
+
+const isMessageRefWithoutConvoId = (
+  subject: unknown,
+): subject is $Typed<Omit<MessageRef, 'convoId'> & { convoId?: string }> =>
+  subject != null &&
+  typeof subject === 'object' &&
+  isValidMessageRef({ convoId: '', ...subject })
+
 export const subjectFromInput = (
   subject: SubjectInput,
   blobs?: string[],
 ): ModSubject => {
-  if (
-    subject.$type === 'com.atproto.admin.defs#repoRef' &&
-    typeof subject.did === 'string'
-  ) {
+  if (isRepoRef(subject)) {
     if (blobs && blobs.length > 0) {
       throw new InvalidRequestError('Blobs do not apply to repo subjects')
     }
     return new RepoSubject(subject.did)
   }
-  if (
-    subject.$type === 'com.atproto.repo.strongRef' &&
-    typeof subject.uri === 'string' &&
-    typeof subject.cid === 'string'
-  ) {
+  if (isStrongRef(subject)) {
     return new RecordSubject(subject.uri, subject.cid, blobs)
   }
   // @NOTE #messageRef is not a report input for com.atproto.moderation.createReport.
   // we are taking advantage of the open union in order for bsky.chat to interoperate here.
-  if (
-    subject.$type === 'chat.bsky.convo.defs#messageRef' &&
-    typeof subject.did === 'string' &&
-    (typeof subject.convoId === 'string' || subject.convoId === undefined) &&
-    typeof subject.messageId === 'string'
-  ) {
-    // @TODO we should start to require subject.convoId is a string in order to properly validate
-    // the #messageRef. temporarily allowing it to be optional as a stopgap for rollout.
+  if (isValidMessageRef(subject)) {
+    return new MessageSubject(subject.did, subject.convoId, subject.messageId)
+  }
+  // @TODO we should start to require subject.convoId is a string in order to properly validate
+  // the #messageRef. temporarily allowing it to be optional as a stopgap for rollout.
+  // The next "if" can be removed once convoId is consistently provided.
+  if (isMessageRefWithoutConvoId(subject)) {
     return new MessageSubject(
       subject.did,
       subject.convoId ?? '',
@@ -106,7 +112,7 @@ export interface ModSubject {
   isRecord(): this is RecordSubject
   isMessage(): this is MessageSubject
   info(): SubjectInfo
-  lex(): RepoRef | StrongRef | MessageRef
+  lex(): $Typed<RepoRef> | $Typed<StrongRef> | $Typed<MessageRef>
 }
 
 export class RepoSubject implements ModSubject {
@@ -133,7 +139,7 @@ export class RepoSubject implements ModSubject {
       meta: null,
     }
   }
-  lex(): RepoRef {
+  lex(): $Typed<RepoRef> {
     return {
       $type: 'com.atproto.admin.defs#repoRef',
       did: this.did,
@@ -174,7 +180,7 @@ export class RecordSubject implements ModSubject {
       meta: null,
     }
   }
-  lex(): StrongRef {
+  lex(): $Typed<StrongRef> {
     return {
       $type: 'com.atproto.repo.strongRef',
       uri: this.uri,
@@ -211,7 +217,7 @@ export class MessageSubject implements ModSubject {
       meta: { convoId: this.convoId || undefined },
     }
   }
-  lex(): MessageRef {
+  lex(): $Typed<MessageRef> {
     return {
       $type: 'chat.bsky.convo.defs#messageRef',
       did: this.did,