@atproto/pds 0.4.186 → 0.4.187

package/dist/lexicon/types/com/atproto/lexicon/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/com/atproto/lexicon/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAajE,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,4BAA4B,CAAA;IACnC,kHAAkH;IAClH,OAAO,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAID,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,yFAE/B;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,gCAErC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/com/atproto/lexicon/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAajE,MAAM,WAAW,IAAI;IACnB,KAAK,EAAE,4BAA4B,CAAA;IACnC,kHAAkH;IAClH,OAAO,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAID,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,yFAE7B;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,8BAEnC;AAED,OAAO,EACL,KAAK,IAAI,IAAI,MAAM,EACnB,MAAM,IAAI,QAAQ,EAClB,YAAY,IAAI,cAAc,GAC/B,CAAA"}

package/dist/lexicon/types/com/atproto/lexicon/schema.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRecord = isRecord;
-exports.validateRecord = validateRecord;
+exports.isMain = isMain;
+exports.isRecord = isMain;
+exports.validateMain = validateMain;
+exports.validateRecord = validateMain;
 const lexicons_1 = require("../../../../lexicons");
 const util_1 = require("../../../../util");
 const is$typed = util_1.is$typed, validate = lexicons_1.validate;
 const id = 'com.atproto.lexicon.schema';
-const hashRecord = 'main';
-function isRecord(v) {
-    return is$typed(v, id, hashRecord);
+const hashMain = 'main';
+function isMain(v) {
+    return is$typed(v, id, hashMain);
 }
-function validateRecord(v) {
-    return validate(v, id, hashRecord, true);
+function validateMain(v) {
+    return validate(v, id, hashMain, true);
 }
 //# sourceMappingURL=schema.js.map

package/dist/lexicon/types/com/atproto/lexicon/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/com/atproto/lexicon/schema.ts"],"names":[],"mappings":";;AAyBA,4BAEC;AAED,wCAEC;AA1BD,mDAA4D;AAC5D,2CAIyB;AAEzB,MAAM,QAAQ,GAAG,eAAS,EACxB,QAAQ,GAAG,mBAAS,CAAA;AACtB,MAAM,EAAE,GAAG,4BAA4B,CAAA;AASvC,MAAM,UAAU,GAAG,MAAM,CAAA;AAEzB,SAAgB,QAAQ,CAAI,CAAI;IAC9B,OAAO,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,CAAA;AACpC,CAAC;AAED,SAAgB,cAAc,CAAI,CAAI;IACpC,OAAO,QAAQ,CAAa,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;AACtD,CAAC","sourcesContent":["/**\n * GENERATED CODE - DO NOT MODIFY\n */\nimport { type ValidationResult, BlobRef } from '@atproto/lexicon'\nimport { CID } from 'multiformats/cid'\nimport { validate as _validate } from '../../../../lexicons'\nimport {\n  type $Typed,\n  is$typed as _is$typed,\n  type OmitKey,\n} from '../../../../util'\n\nconst is$typed = _is$typed,\n  validate = _validate\nconst id = 'com.atproto.lexicon.schema'\n\nexport interface Record {\n  $type: 'com.atproto.lexicon.schema'\n  /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */\n  lexicon: number\n  [k: string]: unknown\n}\n\nconst hashRecord = 'main'\n\nexport function isRecord<V>(v: V) {\n  return is$typed(v, id, hashRecord)\n}\n\nexport function validateRecord<V>(v: V) {\n  return validate<Record & V>(v, id, hashRecord, true)\n}\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/com/atproto/lexicon/schema.ts"],"names":[],"mappings":";;AAyBA,wBAEC;AAQW,0BAAQ;AANpB,oCAEC;AAKiB,sCAAc;AA/BhC,mDAA4D;AAC5D,2CAIyB;AAEzB,MAAM,QAAQ,GAAG,eAAS,EACxB,QAAQ,GAAG,mBAAS,CAAA;AACtB,MAAM,EAAE,GAAG,4BAA4B,CAAA;AASvC,MAAM,QAAQ,GAAG,MAAM,CAAA;AAEvB,SAAgB,MAAM,CAAI,CAAI;IAC5B,OAAO,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;AAClC,CAAC;AAED,SAAgB,YAAY,CAAI,CAAI;IAClC,OAAO,QAAQ,CAAW,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;AAClD,CAAC","sourcesContent":["/**\n * GENERATED CODE - DO NOT MODIFY\n */\nimport { type ValidationResult, BlobRef } from '@atproto/lexicon'\nimport { CID } from 'multiformats/cid'\nimport { validate as _validate } from '../../../../lexicons'\nimport {\n  type $Typed,\n  is$typed as _is$typed,\n  type OmitKey,\n} from '../../../../util'\n\nconst is$typed = _is$typed,\n  validate = _validate\nconst id = 'com.atproto.lexicon.schema'\n\nexport interface Main {\n  $type: 'com.atproto.lexicon.schema'\n  /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */\n  lexicon: number\n  [k: string]: unknown\n}\n\nconst hashMain = 'main'\n\nexport function isMain<V>(v: V) {\n  return is$typed(v, id, hashMain)\n}\n\nexport function validateMain<V>(v: V) {\n  return validate<Main & V>(v, id, hashMain, true)\n}\n\nexport {\n  type Main as Record,\n  isMain as isRecord,\n  validateMain as validateRecord,\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.186",
+  "version": "0.4.187",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -47,20 +47,20 @@
     "uint8arrays": "3.0.0",
     "undici": "^6.19.8",
     "zod": "^3.23.8",
-    "@atproto-labs/fetch-node": "0.1.10",
+    "@atproto-labs/fetch-node": "0.2.0",
     "@atproto-labs/simple-store": "0.3.0",
     "@atproto-labs/simple-store-memory": "0.1.4",
     "@atproto-labs/simple-store-redis": "0.0.1",
     "@atproto-labs/xrpc-utils": "0.0.22",
-    "@atproto/api": "^0.17.3",
+    "@atproto/api": "^0.17.4",
     "@atproto/aws": "^0.2.30",
     "@atproto/common": "^0.4.12",
     "@atproto/crypto": "^0.4.4",
     "@atproto/identity": "^0.4.9",
     "@atproto/lexicon": "^0.5.1",
-    "@atproto/lexicon-resolver": "^0.2.2",
+    "@atproto/lexicon-resolver": "^0.2.3",
     "@atproto/oauth-scopes": "^0.2.1",
-    "@atproto/oauth-provider": "^0.13.2",
+    "@atproto/oauth-provider": "^0.13.3",
     "@atproto/repo": "^0.8.10",
     "@atproto/syntax": "^0.4.1",
     "@atproto/xrpc": "^0.7.5",
@@ -82,9 +82,9 @@
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.17.3",
-    "@atproto/bsky": "^0.0.190",
-    "@atproto/lex-cli": "^0.9.5",
+    "@atproto/api": "^0.17.4",
+    "@atproto/bsky": "^0.0.191",
+    "@atproto/lex-cli": "^0.9.6",
     "@atproto/oauth-client-browser-example": "0.0.6"
   },
   "scripts": {

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

@@ -543,6 +543,8 @@ export class AccountManager {
       opts.token,
     )
     await this.updateAccountPassword({ did, password: opts.password })
+
+    return did
   }
 
   async updateAccountPassword(opts: { did: string; password: string }) {

package/src/account-manager/helpers/email-token.ts

@@ -71,7 +71,7 @@ export const assertValidTokenAndFindDid = async (
 ): Promise<string> => {
   const res = await db.db
     .selectFrom('email_token')
-    .selectAll()
+    .select(['did', 'requestedAt'])
     .where('purpose', '=', purpose)
     .where('token', '=', token.toUpperCase())
     .executeTakeFirst()

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

@@ -331,13 +331,13 @@ export class OAuthStore
   async resetPasswordRequest({
     locale: _locale,
     email,
-  }: ResetPasswordRequestInput): Promise<void> {
+  }: ResetPasswordRequestInput): Promise<Account | null> {
     const account = await this.accountManager.getAccountByEmail(email, {
       includeDeactivated: true,
       includeTakenDown: true,
     })
 
-    if (!account?.email || !account?.handle) return
+    if (!account?.email || !account?.handle) return null
 
     const { handle } = account
     const token = await this.accountManager.createEmailToken(
@@ -350,14 +350,24 @@ export class OAuthStore
       { handle, token },
       { to: account.email },
     )
+
+    return this.buildAccount(account)
   }
 
-  async resetPasswordConfirm(data: ResetPasswordConfirmInput): Promise<void> {
+  async resetPasswordConfirm(
+    data: ResetPasswordConfirmInput,
+  ): Promise<Account | null> {
     try {
-      await this.accountManager.resetPassword(data)
+      const did = await this.accountManager.resetPassword(data)
+      const account = await this.accountManager.getAccount(did, {
+        includeDeactivated: true,
+        includeTakenDown: true,
+      })
+
+      return account ? this.buildAccount(account) : null
     } catch (err) {
       if (err instanceof XrpcInvalidRequestError) {
-        throw new InvalidRequestError(err.message, err)
+        return null
       }
 
       throw err

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

@@ -16,7 +16,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.actor.profile'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.actor.profile'
   displayName?: string
   /** Free-form profile description text. */
@@ -35,12 +35,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

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

@@ -15,7 +15,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.actor.status'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.actor.status'
   /** The status for the account. */
   status: 'app.bsky.actor.status#live' | (string & {})
@@ -26,14 +26,20 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }
 
 /** Advertises an account as currently offering live content. */

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

@@ -16,7 +16,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.feed.generator'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.feed.generator'
   did: string
   displayName: string
@@ -34,12 +34,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

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

@@ -15,7 +15,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.feed.like'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.feed.like'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
@@ -23,12 +23,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

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

@@ -22,7 +22,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.feed.post'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.feed.post'
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -48,14 +48,20 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }
 
 export interface ReplyRef {

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

@@ -14,7 +14,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.feed.postgate'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.feed.postgate'
   createdAt: string
   /** Reference (AT-URI) to the post record. */
@@ -26,14 +26,20 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }
 
 /** Disables embedding of this post. */

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

@@ -15,7 +15,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.feed.repost'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.feed.repost'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
@@ -23,12 +23,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

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

@@ -14,7 +14,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.feed.threadgate'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.feed.threadgate'
   /** Reference (AT-URI) to the post record. */
   post: string
@@ -32,14 +32,20 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }
 
 /** Allow replies from actors mentioned in your post. */

package/src/lexicon/types/app/bsky/graph/block.ts

@@ -14,7 +14,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.block'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.block'
   /** DID of the account to be blocked. */
   subject: string
@@ -22,12 +22,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

package/src/lexicon/types/app/bsky/graph/follow.ts

@@ -14,19 +14,25 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.follow'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.follow'
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

package/src/lexicon/types/app/bsky/graph/list.ts

@@ -17,7 +17,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.list'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.list'
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -30,12 +30,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

package/src/lexicon/types/app/bsky/graph/listblock.ts

@@ -14,7 +14,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.listblock'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.listblock'
   /** Reference (AT-URI) to the mod list record. */
   subject: string
@@ -22,12 +22,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

package/src/lexicon/types/app/bsky/graph/listitem.ts

@@ -14,7 +14,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.listitem'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.listitem'
   /** The account which is included on the list. */
   subject: string
@@ -24,12 +24,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }

package/src/lexicon/types/app/bsky/graph/starterpack.ts

@@ -15,7 +15,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.starterpack'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.starterpack'
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -28,14 +28,20 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }
 
 export interface FeedItem {

package/src/lexicon/types/app/bsky/graph/verification.ts

@@ -14,7 +14,7 @@ const is$typed = _is$typed,
   validate = _validate
 const id = 'app.bsky.graph.verification'
 
-export interface Record {
+export interface Main {
   $type: 'app.bsky.graph.verification'
   /** DID of the subject the verification applies to. */
   subject: string
@@ -27,12 +27,18 @@ export interface Record {
   [k: string]: unknown
 }
 
-const hashRecord = 'main'
+const hashMain = 'main'
 
-export function isRecord<V>(v: V) {
-  return is$typed(v, id, hashRecord)
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateRecord<V>(v: V) {
-  return validate<Record & V>(v, id, hashRecord, true)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain, true)
+}
+
+export {
+  type Main as Record,
+  isMain as isRecord,
+  validateMain as validateRecord,
 }