@atproto/api 0.13.20 → 0.14.0-next.0

package/src/client/types/com/atproto/server/checkAccountStatus.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.server.checkAccountStatus'
 
 export interface QueryParams {}
 
@@ -21,7 +23,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/confirmEmail.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.server.confirmEmail'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/createAccount.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.server.createAccount'
 
 export interface QueryParams {}
 
@@ -23,8 +25,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -35,8 +36,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/createAppPassword.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.server.createAppPassword'
 
 export interface QueryParams {}
 
@@ -14,7 +16,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -47,24 +48,24 @@ export function toKnownErr(e: any) {
 }
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
+}
+
+export function isValidAppPassword<V>(v: V): v is V & $Typed<AppPassword> {
+  return isAppPassword(v) && validateAppPassword(v).success
 }

package/src/client/types/com/atproto/server/createInviteCode.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 = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/createInviteCodes.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.server.createInviteCodes'
 
 export interface QueryParams {}
 
@@ -13,12 +15,10 @@ export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -39,22 +39,22 @@ export function toKnownErr(e: any) {
 }
 
 export interface AccountCodes {
+  $type?: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
+}
+
+export function isValidAccountCodes<V>(v: V): v is V & $Typed<AccountCodes> {
+  return isAccountCodes(v) && validateAccountCodes(v).success
 }

package/src/client/types/com/atproto/server/createSession.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.server.createSession'
 
 export interface QueryParams {}
 
@@ -14,7 +16,6 @@ export interface InputSchema {
   identifier: string
   password: string
   authFactorToken?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -22,14 +23,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/deactivateAccount.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.server.deactivateAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

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

@@ -2,11 +2,14 @@
  * 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.server.defs'
 
 export interface InviteCode {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCode'>
   code: string
   available: number
   disabled: boolean
@@ -14,35 +17,40 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
+}
+
+export function isValidInviteCode<V>(v: V): v is V & $Typed<InviteCode> {
+  return isInviteCode(v) && validateInviteCode(v).success
 }
 
 export interface InviteCodeUse {
+  $type?: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, 'inviteCodeUse')
+}
+
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function isValidInviteCodeUse<V>(v: V): v is V & $Typed<InviteCodeUse> {
+  return isInviteCodeUse(v) && validateInviteCodeUse(v).success
 }

package/src/client/types/com/atproto/server/deleteAccount.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.server.deleteAccount'
 
 export interface QueryParams {}
 
@@ -13,7 +15,6 @@ export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

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

package/src/client/types/com/atproto/server/describeServer.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.server.describeServer'
 
 export interface QueryParams {}
 
@@ -21,7 +23,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -40,36 +41,36 @@ export function toKnownErr(e: any) {
 }
 
 export interface Links {
+  $type?: $Type<'com.atproto.server.describeServer', 'links'>
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
+}
+
+export function isValidLinks<V>(v: V): v is V & $Typed<Links> {
+  return isLinks(v) && validateLinks(v).success
 }
 
 export interface Contact {
+  $type?: $Type<'com.atproto.server.describeServer', 'contact'>
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact<V>(v: V) {
+  return is$typed(v, id, 'contact')
+}
+
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function isValidContact<V>(v: V): v is V & $Typed<Contact> {
+  return isContact(v) && validateContact(v).success
 }

package/src/client/types/com/atproto/server/getAccountInviteCodes.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 './defs'
 
+const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed?: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
@@ -18,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/getServiceAuth.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.server.getServiceAuth'
 
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
@@ -20,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/getSession.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.server.getSession'
 
 export interface QueryParams {}
 
@@ -17,11 +19,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {

package/src/client/types/com/atproto/server/listAppPasswords.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.server.listAppPasswords'
 
 export interface QueryParams {}
 
@@ -13,7 +15,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -42,20 +43,23 @@ export function toKnownErr(e: any) {
 }
 
 export interface AppPassword {
+  $type?: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, 'appPassword')
+}
+
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function isValidAppPassword<V>(v: V): v is V & $Typed<AppPassword> {
+  return isAppPassword(v) && validateAppPassword(v).success
 }

package/src/client/types/com/atproto/server/refreshSession.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.server.refreshSession'
 
 export interface QueryParams {}
 
@@ -16,11 +18,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {

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

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