@atproto/pds 0.4.106 → 0.4.108

package/src/account-manager/oauth-store.ts

@@ -13,6 +13,7 @@ import {
   DeviceStore,
   FoundRequestResult,
   HandleUnavailableError,
+  InvalidInviteCodeError,
   InvalidRequestError,
   NewTokenData,
   RefreshToken,
@@ -36,7 +37,7 @@ import { ActorStore } from '../actor-store/actor-store'
 import { BackgroundQueue } from '../background'
 import { ImageUrlBuilder } from '../image/image-url-builder'
 import { ServerMailer } from '../mailer'
-import { Sequencer } from '../sequencer'
+import { Sequencer, syncEvtDataFromCommit } from '../sequencer'
 import { AccountManager } from './account-manager'
 import { AccountStatus, ActorAccount } from './helpers/account'
 import * as authRequest from './helpers/authorization-request'
@@ -113,6 +114,16 @@ export class OAuthStore
     }
   }
 
+  private async verifyInviteCode(code: string) {
+    try {
+      await this.accountManager.ensureInviteIsAvailable(code)
+    } catch (err) {
+      const message =
+        err instanceof XrpcInvalidRequestError ? err.message : undefined
+      throw new InvalidInviteCodeError(message, err)
+    }
+  }
+
   // AccountStore
 
   async createAccount({
@@ -128,7 +139,7 @@ export class OAuthStore
     await Promise.all([
       this.verifyEmailAvailability(email),
       this.verifyHandleAvailability(handle),
-      !inviteCode || this.accountManager.ensureInviteIsAvailable(inviteCode),
+      !inviteCode || this.verifyInviteCode(inviteCode),
     ])
 
     // @TODO The code bellow should probably be refactored to be common with the
@@ -149,40 +160,52 @@ export class OAuthStore
 
     const { did, op } = plcCreate
 
-    await this.actorStore.create(did, signingKey)
     try {
-      const commit = await this.actorStore.transact(did, (actorTxn) =>
-        actorTxn.repo.createRepo([]),
-      )
-
-      await this.plcClient.sendOperation(did, op)
-
-      await this.accountManager.createAccount({
-        did,
-        handle,
-        email,
-        password,
-        inviteCode,
-        repoCid: commit.cid,
-        repoRev: commit.rev,
-      })
+      await this.actorStore.create(did, signingKey)
       try {
-        await this.sequencer.sequenceIdentityEvt(did, handle)
-        await this.sequencer.sequenceAccountEvt(did, AccountStatus.Active)
-        await this.sequencer.sequenceCommit(did, commit)
-        await this.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
-        await this.actorStore.clearReservedKeypair(signingKeyDid, did)
-
-        const account = await this.accountManager.getAccount(did)
-        if (!account) throw new Error('Account not found')
-
-        return await this.buildAccount(account)
+        const commit = await this.actorStore.transact(did, (actorTxn) =>
+          actorTxn.repo.createRepo([]),
+        )
+
+        await this.plcClient.sendOperation(did, op)
+
+        await this.accountManager.createAccount({
+          did,
+          handle,
+          email,
+          password,
+          inviteCode,
+          repoCid: commit.cid,
+          repoRev: commit.rev,
+        })
+        try {
+          await this.sequencer.sequenceIdentityEvt(did, handle)
+          await this.sequencer.sequenceAccountEvt(did, AccountStatus.Active)
+          await this.sequencer.sequenceCommit(did, commit)
+          await this.sequencer.sequenceSyncEvt(
+            did,
+            syncEvtDataFromCommit(commit),
+          )
+          await this.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
+          await this.actorStore.clearReservedKeypair(signingKeyDid, did)
+
+          const account = await this.accountManager.getAccount(did)
+          if (!account) throw new Error('Account not found')
+
+          return await this.buildAccount(account)
+        } catch (err) {
+          this.accountManager.deleteAccount(did)
+          throw err
+        }
       } catch (err) {
-        this.accountManager.deleteAccount(did)
+        await this.actorStore.destroy(did)
         throw err
       }
     } catch (err) {
-      await this.actorStore.destroy(did)
+      // XrpcError => OAuthError
+      if (err instanceof XrpcInvalidRequestError) {
+        throw new InvalidRequestError(err.message, err)
+      }
       throw err
     }
   }
@@ -314,7 +337,15 @@ export class OAuthStore
   }
 
   async resetPasswordConfirm(data: ResetPasswordConfirmData): Promise<void> {
-    await this.accountManager.resetPassword(data)
+    try {
+      await this.accountManager.resetPassword(data)
+    } catch (err) {
+      if (err instanceof XrpcInvalidRequestError) {
+        throw new InvalidRequestError(err.message, err)
+      }
+
+      throw err
+    }
   }
 
   async verifyHandleAvailability(handle: string): Promise<void> {

package/src/api/com/atproto/server/util.ts

@@ -8,7 +8,7 @@ import { httpLogger } from '../../../../logger'
 
 // generate an invite code preceded by the hostname
 // with '.'s replaced by '-'s so it is not mistakable for a link
-// ex: bsky-app-abc234-567xy
+// ex: bsky-app-abc23-567xy
 // regex: bsky-app-[a-z2-7]{5}-[a-z2-7]{5}
 export const genInvCode = (cfg: ServerConfig): string => {
   return cfg.service.hostname.replaceAll('.', '-') + '-' + getRandomToken()

package/src/lexicon/index.ts

@@ -4,9 +4,9 @@
 import {
   createServer as createXrpcServer,
   Server as XrpcServer,
-  Options as XrpcOptions,
-  AuthVerifier,
-  StreamAuthVerifier,
+  type Options as XrpcOptions,
+  type AuthVerifier,
+  type StreamAuthVerifier,
 } from '@atproto/xrpc-server'
 import { schemas } from './lexicons.js'
 import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount.js'

package/src/lexicon/lexicons.ts

@@ -2,12 +2,12 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import {
-  LexiconDoc,
+  type LexiconDoc,
   Lexicons,
   ValidationError,
-  ValidationResult,
+  type ValidationResult,
 } from '@atproto/lexicon'
-import { $Typed, is$typed, maybe$typed } from './util.js'
+import { type $Typed, is$typed, maybe$typed } from './util.js'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -14459,7 +14459,6 @@ export const schemaDict = {
     },
   },
 } as const satisfies Record<string, LexiconDoc>
-
 export const schemas = Object.values(schemaDict) satisfies LexiconDoc[]
 export const lexicons: Lexicons = new Lexicons(schemas)
 

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
 import type * as AppBskyGraphDefs from '../graph/defs.js'
 import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'

package/src/lexicon/types/app/bsky/actor/getPreferences.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/actor/getProfile.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/actor/getProfiles.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/actor/getSuggestions.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/actor/profile.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
 import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
 

package/src/lexicon/types/app/bsky/actor/putPreferences.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/actor/searchActors.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyActorDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/embed/defs.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 
 const is$typed = _is$typed,
   validate = _validate

package/src/lexicon/types/app/bsky/embed/external.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 
 const is$typed = _is$typed,
   validate = _validate

package/src/lexicon/types/app/bsky/embed/images.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as AppBskyEmbedDefs from './defs.js'
 
 const is$typed = _is$typed,

package/src/lexicon/types/app/bsky/embed/record.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
 import type * as AppBskyFeedDefs from '../feed/defs.js'
 import type * as AppBskyGraphDefs from '../graph/defs.js'

package/src/lexicon/types/app/bsky/embed/recordWithMedia.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as AppBskyEmbedRecord from './record.js'
 import type * as AppBskyEmbedImages from './images.js'
 import type * as AppBskyEmbedVideo from './video.js'

package/src/lexicon/types/app/bsky/embed/video.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as AppBskyEmbedDefs from './defs.js'
 
 const is$typed = _is$typed,

package/src/lexicon/types/app/bsky/feed/defs.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as AppBskyActorDefs from '../actor/defs.js'
 import type * as AppBskyEmbedImages from '../embed/images.js'
 import type * as AppBskyEmbedVideo from '../embed/video.js'

package/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 const is$typed = _is$typed,

package/src/lexicon/types/app/bsky/feed/generator.ts

@@ -1,10 +1,14 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import type * as AppBskyRichtextFacet from '../richtext/facet.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
 

package/src/lexicon/types/app/bsky/feed/getActorFeeds.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/feed/getActorLikes.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/feed/getFeed.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'
 

package/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts

@@ -2,10 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import { validate as _validate } from '../../../../lexicons'
-import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import type * as AppBskyFeedDefs from './defs.js'