@atproto/api 0.13.20 → 0.14.0-next.0

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

@@ -3,12 +3,14 @@
  */
 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'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
@@ -19,13 +21,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/searchAccounts.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.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
@@ -19,7 +21,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/sendEmail.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.sendEmail'
 
 export interface QueryParams {}
 
@@ -16,12 +18,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/updateAccountEmail.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.updateAccountEmail'
 
 export interface QueryParams {}
 
@@ -13,7 +15,6 @@ export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/updateAccountHandle.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.updateAccountHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/admin/updateAccountPassword.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.updateAccountPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

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

@@ -3,33 +3,33 @@
  */
 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'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/identity/getRecommendedDidCredentials.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.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
 
@@ -15,9 +17,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/identity/requestPlcOperationSignature.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.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
 

package/src/client/types/com/atproto/identity/resolveHandle.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.identity.resolveHandle'
 
 export interface QueryParams {
   /** The handle to resolve. */
@@ -16,7 +18,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/identity/signPlcOperation.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.identity.signPlcOperation'
 
 export interface QueryParams {}
 
@@ -14,15 +16,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/identity/submitPlcOperation.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.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/identity/updateHandle.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.identity.updateHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

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

@@ -2,12 +2,15 @@
  * 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'
+
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: $Type<'com.atproto.label.defs', 'label'>
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -26,60 +29,63 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, 'label')
+}
+
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function isValidLabel<V>(v: V): v is V & $Typed<Label> {
+  return isLabel(v) && validateLabel(v).success
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabels'>
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
+}
+
+export function isValidSelfLabels<V>(v: V): v is V & $Typed<SelfLabels> {
+  return isSelfLabels(v) && validateSelfLabels(v).success
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: $Type<'com.atproto.label.defs', 'selfLabel'>
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, 'selfLabel')
+}
+
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function isValidSelfLabel<V>(v: V): v is V & $Typed<SelfLabel> {
+  return isSelfLabel(v) && validateSelfLabel(v).success
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -91,48 +97,53 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, 'labelValueDefinition')
+}
+
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function isValidLabelValueDefinition<V>(
+  v: V,
+): v is V & $Typed<LabelValueDefinition> {
+  return isLabelValueDefinition(v) && validateLabelValueDefinition(v).success
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
+  ) as ValidationResult<LabelValueDefinitionStrings>
+}
+
+export function isValidLabelValueDefinitionStrings<V>(
+  v: V,
+): v is V & $Typed<LabelValueDefinitionStrings> {
+  return (
+    isLabelValueDefinitionStrings(v) &&
+    validateLabelValueDefinitionStrings(v).success
   )
 }
 

package/src/client/types/com/atproto/label/queryLabels.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 ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
@@ -22,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/label/subscribeLabels.ts

@@ -3,43 +3,45 @@
  */
 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 ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.subscribeLabels'
+
 export interface Labels {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'labels'>
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
+}
+
+export function isValidLabels<V>(v: V): v is V & $Typed<Labels> {
+  return isLabels(v) && validateLabels(v).success
 }
 
 export interface Info {
+  $type?: $Type<'com.atproto.label.subscribeLabels', 'info'>
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, 'info')
+}
+
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function isValidInfo<V>(v: V): v is V & $Typed<Info> {
+  return isInfo(v) && validateInfo(v).success
 }

package/src/client/types/com/atproto/moderation/createReport.ts

@@ -3,13 +3,15 @@
  */
 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 ComAtprotoModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../admin/defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,10 +19,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -28,12 +29,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {