@atproto/bsky 0.0.221 → 0.0.222

package/dist/hydration/label.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LabelHydrator = exports.Labels = void 0;
 const syntax_1 = require("@atproto/syntax");
-const lexicons_1 = require("../lexicon/lexicons");
+const index_js_1 = require("../lexicons/index.js");
 const util_1 = require("./util");
 class Labels extends util_1.HydrationMap {
     static key(label) {
         return `${label.src}::${label.val}`;
     }
     merge(map) {
-        map.forEach((theirs, key) => {
+        for (const [key, theirs] of map) {
             if (!theirs)
-                return;
+                continue;
             const mine = this.get(key);
             if (mine) {
                 mine.isTakendown = mine.isTakendown || theirs.isTakendown;
@@ -20,7 +20,7 @@ class Labels extends util_1.HydrationMap {
             else {
                 this.set(key, theirs);
             }
-        });
+        }
         return this;
     }
     getBySubject(sub) {
@@ -46,18 +46,19 @@ class LabelHydrator {
         });
     }
     async getLabelsForSubjects(subjects, labelers) {
+        const map = new Labels();
         if (!subjects.length || !labelers.dids.length)
-            return new Labels();
+            return map;
         const res = await this.dataplane.getLabels({
             subjects,
             issuers: labelers.dids,
         });
-        return res.labels.reduce((acc, cur) => {
-            const parsed = (0, util_1.parseJsonBytes)(cur);
+        for (const cur of res.labels) {
+            const parsed = (0, util_1.parseJsonBytes)(index_js_1.com.atproto.label.defs.label, cur);
             if (!parsed || parsed.neg)
-                return acc;
+                continue;
             const { sig: _, ...label } = parsed;
-            let entry = acc.get(label.uri);
+            let entry = map.get(label.uri);
             if (!entry) {
                 entry = {
                     isImpersonation: false,
@@ -65,7 +66,7 @@ class LabelHydrator {
                     needsReview: false,
                     labels: new util_1.HydrationMap(),
                 };
-                acc.set(label.uri, entry);
+                map.set(label.uri, entry);
             }
             const isActionableNeedsReview = label.val === NEEDS_REVIEW_LABEL &&
                 !label.neg &&
@@ -87,45 +88,60 @@ class LabelHydrator {
                 labelers.redact.has(label.src)) {
                 entry.isImpersonation = true;
             }
-            return acc;
-        }, new Labels());
+        }
+        return map;
     }
     async getLabelers(dids, includeTakedowns = false) {
+        const map = new util_1.HydrationMap();
+        if (!dids.length)
+            return map;
         const res = await this.dataplane.getLabelerRecords({
             uris: dids.map(labelerDidToUri),
         });
-        return dids.reduce((acc, did, i) => {
-            const record = (0, util_1.parseRecord)(res.records[i], includeTakedowns);
-            return acc.set(did, record ?? null);
-        }, new util_1.HydrationMap());
+        for (let i = 0; i < dids.length; i++) {
+            const did = dids[i];
+            const record = (0, util_1.parseRecord)(index_js_1.app.bsky.labeler.service.main, res.records[i], includeTakedowns);
+            map.set(did, record ?? null);
+        }
+        return map;
     }
     async getLabelerViewerStates(dids, viewer) {
+        const map = new util_1.HydrationMap();
+        if (!dids.length)
+            return map;
         const likes = await this.dataplane.getLikesByActorAndSubjects({
             actorDid: viewer,
             refs: dids.map((did) => ({ uri: labelerDidToUri(did) })),
         });
-        return dids.reduce((acc, did, i) => {
-            return acc.set(did, {
+        for (let i = 0; i < dids.length; i++) {
+            const did = dids[i];
+            map.set(did, {
                 like: (0, util_1.parseString)(likes.uris[i]),
             });
-        }, new util_1.HydrationMap());
+        }
+        return map;
     }
     async getLabelerAggregates(dids, viewer) {
+        const map = new util_1.HydrationMap();
+        if (!dids.length)
+            return map;
         const refs = dids.map((did) => ({ uri: labelerDidToUri(did) }));
         const counts = await this.dataplane.getInteractionCounts({
             refs,
             skipCacheForDids: viewer ? [viewer] : undefined,
         });
-        return dids.reduce((acc, did, i) => {
-            return acc.set(did, {
+        for (let i = 0; i < dids.length; i++) {
+            const did = dids[i];
+            map.set(did, {
                 likes: counts.likes[i] ?? 0,
             });
-        }, new util_1.HydrationMap());
+        }
+        return map;
     }
 }
 exports.LabelHydrator = LabelHydrator;
 const labelerDidToUri = (did) => {
-    return syntax_1.AtUri.make(did, lexicons_1.ids.AppBskyLabelerService, 'self').toString();
+    return syntax_1.AtUri.make(did, index_js_1.app.bsky.labeler.service.$type, 'self').toString();
 };
 const IMPERSONATION_LABEL = 'impersonation';
 const TAKEDOWN_LABELS = ['!takedown', '!suspend'];

package/dist/hydration/label.js.map

@@ -1 +1 @@
-{"version":3,"file":"label.js","sourceRoot":"","sources":["../../src/hydration/label.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtUri } from '@atproto/syntax'\nimport { DataPlaneClient } from '../data-plane/client'\nimport { ids } from '../lexicon/lexicons'\nimport { Record as LabelerRecord } from '../lexicon/types/app/bsky/labeler/service'\nimport { Label } from '../lexicon/types/com/atproto/label/defs'\nimport { ParsedLabelers } from '../util'\nimport {\n  HydrationMap,\n  Merges,\n  RecordInfo,\n  parseJsonBytes,\n  parseRecord,\n  parseString,\n} from './util'\n\nexport type { Label } from '../lexicon/types/com/atproto/label/defs'\n\nexport type SubjectLabels = {\n  isImpersonation: boolean\n  isTakendown: boolean\n  needsReview: boolean\n  labels: HydrationMap<Label> // src + val -> label\n}\n\nexport class Labels extends HydrationMap<SubjectLabels> implements Merges {\n  static key(label: Label) {\n    return `${label.src}::${label.val}`\n  }\n  merge(map: Labels): this {\n    map.forEach((theirs, key) => {\n      if (!theirs) return\n      const mine = this.get(key)\n      if (mine) {\n        mine.isTakendown = mine.isTakendown || theirs.isTakendown\n        mine.labels = mine.labels.merge(theirs.labels)\n      } else {\n        this.set(key, theirs)\n      }\n    })\n    return this\n  }\n  getBySubject(sub: string): Label[] {\n    const it = this.get(sub)?.labels.values()\n    if (!it) return []\n    const labels: Label[] = []\n    for (const label of it) {\n      if (label) labels.push(label)\n    }\n    return labels\n  }\n}\n\nexport type LabelerAgg = {\n  likes: number\n}\n\nexport type LabelerAggs = HydrationMap<LabelerAgg>\n\nexport type Labeler = RecordInfo<LabelerRecord>\nexport type Labelers = HydrationMap<Labeler>\n\nexport type LabelerViewerState = {\n  like?: string\n}\n\nexport type LabelerViewerStates = HydrationMap<LabelerViewerState>\n\nexport class LabelHydrator {\n  constructor(public dataplane: DataPlaneClient) {}\n\n  async getLabelsForSubjects(\n    subjects: string[],\n    labelers: ParsedLabelers,\n  ): Promise<Labels> {\n    if (!subjects.length || !labelers.dids.length) return new Labels()\n    const res = await this.dataplane.getLabels({\n      subjects,\n      issuers: labelers.dids,\n    })\n\n    return res.labels.reduce((acc, cur) => {\n      const parsed = parseJsonBytes(cur) as Label | undefined\n      if (!parsed || parsed.neg) return acc\n      const { sig: _, ...label } = parsed\n      let entry = acc.get(label.uri)\n      if (!entry) {\n        entry = {\n          isImpersonation: false,\n          isTakendown: false,\n          needsReview: false,\n          labels: new HydrationMap(),\n        }\n        acc.set(label.uri, entry)\n      }\n\n      const isActionableNeedsReview =\n        label.val === NEEDS_REVIEW_LABEL &&\n        !label.neg &&\n        labelers.redact.has(label.src)\n\n      // we action needs review labels on backend for now so don't send to client until client has proper logic for them\n      if (!isActionableNeedsReview) {\n        entry.labels.set(Labels.key(label), label)\n      }\n\n      if (\n        TAKEDOWN_LABELS.includes(label.val) &&\n        !label.neg &&\n        labelers.redact.has(label.src)\n      ) {\n        entry.isTakendown = true\n      }\n      if (isActionableNeedsReview) {\n        entry.needsReview = true\n      }\n      if (\n        label.val === IMPERSONATION_LABEL &&\n        !label.neg &&\n        labelers.redact.has(label.src)\n      ) {\n        entry.isImpersonation = true\n      }\n\n      return acc\n    }, new Labels())\n  }\n\n  async getLabelers(\n    dids: string[],\n    includeTakedowns = false,\n  ): Promise<Labelers> {\n    const res = await this.dataplane.getLabelerRecords({\n      uris: dids.map(labelerDidToUri),\n    })\n    return dids.reduce((acc, did, i) => {\n      const record = parseRecord<LabelerRecord>(\n        res.records[i],\n        includeTakedowns,\n      )\n      return acc.set(did, record ?? null)\n    }, new HydrationMap<Labeler>())\n  }\n\n  async getLabelerViewerStates(\n    dids: string[],\n    viewer: string,\n  ): Promise<LabelerViewerStates> {\n    const likes = await this.dataplane.getLikesByActorAndSubjects({\n      actorDid: viewer,\n      refs: dids.map((did) => ({ uri: labelerDidToUri(did) })),\n    })\n    return dids.reduce((acc, did, i) => {\n      return acc.set(did, {\n        like: parseString(likes.uris[i]),\n      })\n    }, new HydrationMap<LabelerViewerState>())\n  }\n\n  async getLabelerAggregates(\n    dids: string[],\n    viewer: string | null,\n  ): Promise<LabelerAggs> {\n    const refs = dids.map((did) => ({ uri: labelerDidToUri(did) }))\n    const counts = await this.dataplane.getInteractionCounts({\n      refs,\n      skipCacheForDids: viewer ? [viewer] : undefined,\n    })\n    return dids.reduce((acc, did, i) => {\n      return acc.set(did, {\n        likes: counts.likes[i] ?? 0,\n      })\n    }, new HydrationMap<LabelerAgg>())\n  }\n}\n\nconst labelerDidToUri = (did: string): string => {\n  return AtUri.make(did, ids.AppBskyLabelerService, 'self').toString()\n}\n\nconst IMPERSONATION_LABEL = 'impersonation'\nconst TAKEDOWN_LABELS = ['!takedown', '!suspend']\nconst NEEDS_REVIEW_LABEL = 'needs-review'\n"]}
+{"version":3,"file":"label.js","sourceRoot":"","sources":["../../src/hydration/label.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtUri, AtUriString, DidString, UriString } from '@atproto/syntax'\nimport { DataPlaneClient } from '../data-plane/client'\nimport { app, com } from '../lexicons/index.js'\nimport { ParsedLabelers } from '../util'\nimport { Label, LabelerRecord } from '../views/types.js'\nimport {\n  HydrationMap,\n  Merges,\n  RecordInfo,\n  parseJsonBytes,\n  parseRecord,\n  parseString,\n} from './util'\n\nexport type { Label }\n\nexport type SubjectLabels = {\n  isImpersonation: boolean\n  isTakendown: boolean\n  needsReview: boolean\n  labels: HydrationMap<`${string}::${string}`, Label> // src + val -> label\n}\n\nexport class Labels\n  extends HydrationMap<UriString, SubjectLabels>\n  implements Merges\n{\n  static key(label: Label): `${string}::${string}` {\n    return `${label.src}::${label.val}`\n  }\n  merge(map: Labels): this {\n    for (const [key, theirs] of map) {\n      if (!theirs) continue\n      const mine = this.get(key)\n      if (mine) {\n        mine.isTakendown = mine.isTakendown || theirs.isTakendown\n        mine.labels = mine.labels.merge(theirs.labels)\n      } else {\n        this.set(key, theirs)\n      }\n    }\n    return this\n  }\n  getBySubject(sub: UriString): Label[] {\n    const it = this.get(sub)?.labels.values()\n    if (!it) return []\n    const labels: Label[] = []\n    for (const label of it) {\n      if (label) labels.push(label)\n    }\n    return labels\n  }\n}\n\nexport type LabelerAgg = {\n  likes: number\n}\n\nexport type LabelerAggs = HydrationMap<DidString, LabelerAgg>\n\nexport type Labeler = RecordInfo<LabelerRecord>\nexport type Labelers = HydrationMap<DidString, Labeler>\n\nexport type LabelerViewerState = {\n  like?: AtUriString\n}\n\nexport type LabelerViewerStates = HydrationMap<DidString, LabelerViewerState>\n\nexport class LabelHydrator {\n  constructor(public dataplane: DataPlaneClient) {}\n\n  async getLabelsForSubjects(\n    subjects: UriString[],\n    labelers: ParsedLabelers,\n  ): Promise<Labels> {\n    const map = new Labels()\n\n    if (!subjects.length || !labelers.dids.length) return map\n\n    const res = await this.dataplane.getLabels({\n      subjects,\n      issuers: labelers.dids,\n    })\n\n    for (const cur of res.labels) {\n      const parsed = parseJsonBytes(com.atproto.label.defs.label, cur)\n      if (!parsed || parsed.neg) continue\n      const { sig: _, ...label } = parsed\n      let entry = map.get(label.uri)\n      if (!entry) {\n        entry = {\n          isImpersonation: false,\n          isTakendown: false,\n          needsReview: false,\n          labels: new HydrationMap(),\n        }\n        map.set(label.uri, entry)\n      }\n\n      const isActionableNeedsReview =\n        label.val === NEEDS_REVIEW_LABEL &&\n        !label.neg &&\n        labelers.redact.has(label.src)\n\n      // we action needs review labels on backend for now so don't send to client until client has proper logic for them\n      if (!isActionableNeedsReview) {\n        entry.labels.set(Labels.key(label), label)\n      }\n\n      if (\n        TAKEDOWN_LABELS.includes(label.val) &&\n        !label.neg &&\n        labelers.redact.has(label.src)\n      ) {\n        entry.isTakendown = true\n      }\n      if (isActionableNeedsReview) {\n        entry.needsReview = true\n      }\n      if (\n        label.val === IMPERSONATION_LABEL &&\n        !label.neg &&\n        labelers.redact.has(label.src)\n      ) {\n        entry.isImpersonation = true\n      }\n    }\n\n    return map\n  }\n\n  async getLabelers(\n    dids: DidString[],\n    includeTakedowns = false,\n  ): Promise<Labelers> {\n    const map: Labelers = new HydrationMap()\n    if (!dids.length) return map\n\n    const res = await this.dataplane.getLabelerRecords({\n      uris: dids.map(labelerDidToUri),\n    })\n    for (let i = 0; i < dids.length; i++) {\n      const did = dids[i]\n      const record = parseRecord(\n        app.bsky.labeler.service.main,\n        res.records[i],\n        includeTakedowns,\n      )\n      map.set(did, record ?? null)\n    }\n\n    return map\n  }\n\n  async getLabelerViewerStates(\n    dids: DidString[],\n    viewer: DidString,\n  ): Promise<LabelerViewerStates> {\n    const map: LabelerViewerStates = new HydrationMap()\n    if (!dids.length) return map\n\n    const likes = await this.dataplane.getLikesByActorAndSubjects({\n      actorDid: viewer,\n      refs: dids.map((did) => ({ uri: labelerDidToUri(did) })),\n    })\n\n    for (let i = 0; i < dids.length; i++) {\n      const did = dids[i]\n      map.set(did, {\n        like: parseString(likes.uris[i]),\n      })\n    }\n\n    return map\n  }\n\n  async getLabelerAggregates(\n    dids: DidString[],\n    viewer: DidString | null,\n  ): Promise<LabelerAggs> {\n    const map: LabelerAggs = new HydrationMap()\n    if (!dids.length) return map\n\n    const refs = dids.map((did) => ({ uri: labelerDidToUri(did) }))\n    const counts = await this.dataplane.getInteractionCounts({\n      refs,\n      skipCacheForDids: viewer ? [viewer] : undefined,\n    })\n    for (let i = 0; i < dids.length; i++) {\n      const did = dids[i]\n      map.set(did, {\n        likes: counts.likes[i] ?? 0,\n      })\n    }\n\n    return map\n  }\n}\n\nconst labelerDidToUri = (did: DidString): AtUriString => {\n  return AtUri.make(did, app.bsky.labeler.service.$type, 'self').toString()\n}\n\nconst IMPERSONATION_LABEL = 'impersonation'\nconst TAKEDOWN_LABELS = ['!takedown', '!suspend']\nconst NEEDS_REVIEW_LABEL = 'needs-review'\n"]}

package/dist/hydration/util.d.ts

@@ -1,37 +1,34 @@
 import { Timestamp } from '@bufbuild/protobuf';
-import { CID } from 'multiformats/cid';
-import { Record } from '../proto/bsky_pb';
-export declare class HydrationMap<T> extends Map<string, T | null> implements Merges {
-    merge(map: HydrationMap<T>): this;
+import { AtUriString, Cid, Infer, LexParseOptions, LexValue, RecordSchema, Schema, TypedLexMap, ValidateOptions } from '@atproto/lex';
+import { Record as RecordEntry } from '../proto/bsky_pb';
+export declare class HydrationMap<K, T> extends Map<K, T | null> implements Merges {
+    merge(map: HydrationMap<K, T>): this;
 }
 export interface Merges {
     merge<T extends this>(map: T): this;
 }
-type UnknownRecord = {
+export type RecordInfo<T extends {
     $type: string;
-    [x: string]: unknown;
-};
-export type RecordInfo<T extends UnknownRecord> = {
-    record: T;
+}> = {
+    record: T & TypedLexMap;
     cid: string;
     sortedAt: Date;
     indexedAt: Date;
     takedownRef: string | undefined;
 };
-export declare const mergeMaps: <V, M extends HydrationMap<V>>(mapA?: M, mapB?: M) => M | undefined;
-export declare const mergeNestedMaps: <V, M extends HydrationMap<HydrationMap<V>>>(mapA?: M, mapB?: M) => M | undefined;
-export declare const mergeManyMaps: <T>(...maps: HydrationMap<T>[]) => HydrationMap<T> | undefined;
+export declare const mergeMaps: <V extends HydrationMap<any, any>>(mapA?: V, mapB?: V) => V | undefined;
+export declare const mergeNestedMaps: <K, V extends HydrationMap<any, any>>(mapA?: HydrationMap<K, V>, mapB?: HydrationMap<K, V>) => HydrationMap<K, V> | undefined;
+export declare const mergeManyMaps: <K, T>(...maps: HydrationMap<K, T>[]) => HydrationMap<K, T> | undefined;
 export type ItemRef = {
-    uri: string;
+    uri: AtUriString;
     cid?: string;
 };
-export declare const parseRecord: <T extends UnknownRecord>(entry: Record, includeTakedowns: boolean) => RecordInfo<T> | undefined;
-export declare const parseRecordBytes: <T>(bytes: Uint8Array | undefined) => T | undefined;
-export declare const parseJsonBytes: (bytes: Uint8Array | undefined) => unknown;
-export declare const parseString: (str: string | undefined) => string | undefined;
-export declare const parseCid: (cidStr: string | undefined) => CID | undefined;
+export declare function parseRecord<TSchema extends RecordSchema>(recordSchema: TSchema, recordEntry: RecordEntry, includeTakedowns: boolean): RecordInfo<Infer<TSchema>> | undefined;
+export declare const parseJsonBytes: <TSchema extends Schema<LexValue>>(schema: TSchema, bytes: Uint8Array | undefined, options?: LexParseOptions & ValidateOptions) => Infer<TSchema> | undefined;
+export declare const parseString: <T extends string | undefined>(str: undefined | string) => T | undefined;
+export declare const parseCid: (cidStr: string | undefined) => Cid | null;
 export declare const parseDate: (timestamp: Timestamp | undefined) => Date | undefined;
-export declare const urisByCollection: (uris: string[]) => Map<string, string[]>;
+export declare const urisByCollection: <T extends string>(uris: Iterable<T>) => Map<string, T[]>;
 export declare const split: <T>(items: T[], predicate: (item: T) => boolean) => [T[], T[]];
 export declare const safeTakedownRef: (obj?: {
     takenDown: boolean;
@@ -41,5 +38,4 @@ export declare const isActivitySubscriptionEnabled: ({ post, reply, }: {
     post: boolean;
     reply: boolean;
 }) => boolean;
-export {};
 //# sourceMappingURL=util.d.ts.map

package/dist/hydration/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/hydration/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/hydration/util.ts"],"names":[],"mappings":"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"}

package/dist/hydration/util.js

@@ -1,49 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isActivitySubscriptionEnabled = exports.safeTakedownRef = exports.split = exports.urisByCollection = exports.parseDate = exports.parseCid = exports.parseString = exports.parseJsonBytes = exports.parseRecordBytes = exports.parseRecord = exports.mergeManyMaps = exports.mergeNestedMaps = exports.mergeMaps = exports.HydrationMap = void 0;
-const cid_1 = require("multiformats/cid");
-const ui8 = __importStar(require("uint8arrays"));
-const lexicon_1 = require("@atproto/lexicon");
+exports.isActivitySubscriptionEnabled = exports.safeTakedownRef = exports.split = exports.urisByCollection = exports.parseDate = exports.parseCid = exports.parseString = exports.parseJsonBytes = exports.mergeManyMaps = exports.mergeNestedMaps = exports.mergeMaps = exports.HydrationMap = void 0;
+exports.parseRecord = parseRecord;
+const lex_1 = require("@atproto/lex");
 const syntax_1 = require("@atproto/syntax");
-const lexicons_1 = require("../lexicon/lexicons");
 class HydrationMap extends Map {
     merge(map) {
-        map.forEach((val, key) => {
+        for (const [key, val] of map) {
             this.set(key, val);
-        });
+        }
         return this;
     }
 }
@@ -72,66 +37,43 @@ const mergeManyMaps = (...maps) => {
     return maps.reduce(exports.mergeMaps, undefined);
 };
 exports.mergeManyMaps = mergeManyMaps;
-const parseRecord = (entry, includeTakedowns) => {
-    if (!includeTakedowns && entry.takenDown) {
+function parseRecord(recordSchema, recordEntry, includeTakedowns) {
+    if (!includeTakedowns && recordEntry.takenDown) {
         return undefined;
     }
-    const record = (0, exports.parseRecordBytes)(entry.record);
-    const cid = entry.cid;
-    const sortedAt = (0, exports.parseDate)(entry.sortedAt) ?? new Date(0);
-    const indexedAt = (0, exports.parseDate)(entry.indexedAt) ?? new Date(0);
-    if (!record || !cid)
+    const cid = recordEntry.cid;
+    if (!cid)
         return;
-    if (!isValidRecord(record)) {
+    const record = (0, exports.parseJsonBytes)(recordSchema, recordEntry.record);
+    if (!record) {
         return;
     }
     return {
         record,
         cid,
-        sortedAt,
-        indexedAt,
-        takedownRef: (0, exports.safeTakedownRef)(entry),
+        sortedAt: (0, exports.parseDate)(recordEntry.sortedAt) ?? new Date(0),
+        indexedAt: (0, exports.parseDate)(recordEntry.indexedAt) ?? new Date(0),
+        takedownRef: (0, exports.safeTakedownRef)(recordEntry),
     };
-};
-exports.parseRecord = parseRecord;
-const isValidRecord = (json) => {
-    const lexRecord = (0, lexicon_1.jsonToLex)(json);
-    if (typeof lexRecord?.['$type'] !== 'string') {
-        return false;
-    }
-    try {
-        lexicons_1.lexicons.assertValidRecord(lexRecord['$type'], lexRecord);
-        return true;
-    }
-    catch {
-        return false;
-    }
-};
-// @NOTE not parsed into lex format, so will not match lexicon record types on CID and blob values.
-const parseRecordBytes = (bytes) => {
-    return (0, exports.parseJsonBytes)(bytes);
-};
-exports.parseRecordBytes = parseRecordBytes;
-const parseJsonBytes = (bytes) => {
+}
+const parseJsonBytes = (schema, bytes, options = { strict: false }) => {
     if (!bytes || bytes.byteLength === 0)
-        return;
-    const parsed = JSON.parse(ui8.toString(bytes, 'utf8'));
-    return parsed ?? undefined;
+        return undefined;
+    // @NOTE Buffer.from(bytes) creates a copy of the ArrayBuffer
+    const jsonBuffer = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    const jsonString = jsonBuffer.toString('utf8');
+    const value = (0, lex_1.lexParse)(jsonString, options);
+    return schema.ifMatches(value, options);
 };
 exports.parseJsonBytes = parseJsonBytes;
 const parseString = (str) => {
-    return str && str.length > 0 ? str : undefined;
+    return str ? str : undefined;
 };
 exports.parseString = parseString;
 const parseCid = (cidStr) => {
-    if (!cidStr || cidStr.length === 0)
-        return;
-    try {
-        return cid_1.CID.parse(cidStr);
-    }
-    catch {
-        return;
-    }
+    if (!cidStr)
+        return null;
+    return (0, lex_1.parseCidSafe)(cidStr);
 };
 exports.parseCid = parseCid;
 const parseDate = (timestamp) => {

package/dist/hydration/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/hydration/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport { CID } from 'multiformats/cid'\nimport * as ui8 from 'uint8arrays'\nimport { jsonToLex } from '@atproto/lexicon'\nimport { AtUri } from '@atproto/syntax'\nimport { lexicons } from '../lexicon/lexicons'\nimport { Record } from '../proto/bsky_pb'\n\nexport class HydrationMap<T> extends Map<string, T | null> implements Merges {\n  merge(map: HydrationMap<T>): this {\n    map.forEach((val, key) => {\n      this.set(key, val)\n    })\n    return this\n  }\n}\n\nexport interface Merges {\n  merge<T extends this>(map: T): this\n}\n\ntype UnknownRecord = { $type: string; [x: string]: unknown }\n\nexport type RecordInfo<T extends UnknownRecord> = {\n  record: T\n  cid: string\n  sortedAt: Date\n  indexedAt: Date\n  takedownRef: string | undefined\n}\n\nexport const mergeMaps = <V, M extends HydrationMap<V>>(\n  mapA?: M,\n  mapB?: M,\n): M | undefined => {\n  if (!mapA) return mapB\n  if (!mapB) return mapA\n  return mapA.merge(mapB)\n}\n\nexport const mergeNestedMaps = <V, M extends HydrationMap<HydrationMap<V>>>(\n  mapA?: M,\n  mapB?: M,\n): M | undefined => {\n  if (!mapA) return mapB\n  if (!mapB) return mapA\n\n  for (const [key, map] of mapB) {\n    const merged = mergeMaps(mapA.get(key) ?? undefined, map ?? undefined)\n    mapA.set(key, merged ?? null)\n  }\n\n  return mapA\n}\n\nexport const mergeManyMaps = <T>(...maps: HydrationMap<T>[]) => {\n  return maps.reduce(mergeMaps, undefined as HydrationMap<T> | undefined)\n}\n\nexport type ItemRef = { uri: string; cid?: string }\n\nexport const parseRecord = <T extends UnknownRecord>(\n  entry: Record,\n  includeTakedowns: boolean,\n): RecordInfo<T> | undefined => {\n  if (!includeTakedowns && entry.takenDown) {\n    return undefined\n  }\n  const record = parseRecordBytes<T>(entry.record)\n  const cid = entry.cid\n  const sortedAt = parseDate(entry.sortedAt) ?? new Date(0)\n  const indexedAt = parseDate(entry.indexedAt) ?? new Date(0)\n  if (!record || !cid) return\n  if (!isValidRecord(record)) {\n    return\n  }\n  return {\n    record,\n    cid,\n    sortedAt,\n    indexedAt,\n    takedownRef: safeTakedownRef(entry),\n  }\n}\n\nconst isValidRecord = (json: unknown) => {\n  const lexRecord = jsonToLex(json)\n  if (typeof lexRecord?.['$type'] !== 'string') {\n    return false\n  }\n  try {\n    lexicons.assertValidRecord(lexRecord['$type'], lexRecord)\n    return true\n  } catch {\n    return false\n  }\n}\n\n// @NOTE not parsed into lex format, so will not match lexicon record types on CID and blob values.\nexport const parseRecordBytes = <T>(\n  bytes: Uint8Array | undefined,\n): T | undefined => {\n  return parseJsonBytes(bytes) as T\n}\n\nexport const parseJsonBytes = (bytes: Uint8Array | undefined): unknown => {\n  if (!bytes || bytes.byteLength === 0) return\n  const parsed = JSON.parse(ui8.toString(bytes, 'utf8'))\n  return parsed ?? undefined\n}\n\nexport const parseString = (str: string | undefined): string | undefined => {\n  return str && str.length > 0 ? str : undefined\n}\n\nexport const parseCid = (cidStr: string | undefined): CID | undefined => {\n  if (!cidStr || cidStr.length === 0) return\n  try {\n    return CID.parse(cidStr)\n  } catch {\n    return\n  }\n}\n\nexport const parseDate = (\n  timestamp: Timestamp | undefined,\n): Date | undefined => {\n  if (!timestamp) return undefined\n  const date = timestamp.toDate()\n  // Check for year 1 (0001-01-01 00:00:00 UTC) which is -62135596800000ms from epoch.\n  // The Go dataplane gives us those values as they come from the Go zero-value for dates.\n  if (date.getTime() === -62135596800000) return undefined\n  return date\n}\n\nexport const urisByCollection = (uris: string[]): Map<string, string[]> => {\n  const result = new Map<string, string[]>()\n  for (const uri of uris) {\n    const collection = new AtUri(uri).collection\n    const items = result.get(collection) ?? []\n    items.push(uri)\n    result.set(collection, items)\n  }\n  return result\n}\n\nexport const split = <T>(\n  items: T[],\n  predicate: (item: T) => boolean,\n): [T[], T[]] => {\n  const yes: T[] = []\n  const no: T[] = []\n  for (const item of items) {\n    if (predicate(item)) {\n      yes.push(item)\n    } else {\n      no.push(item)\n    }\n  }\n  return [yes, no]\n}\n\nexport const safeTakedownRef = (obj?: {\n  takenDown: boolean\n  takedownRef: string\n}): string | undefined => {\n  if (!obj) return\n  if (obj.takedownRef) return obj.takedownRef\n  if (obj.takenDown) return 'BSKY-TAKEDOWN-UNKNOWN'\n}\n\nexport const isActivitySubscriptionEnabled = ({\n  post,\n  reply,\n}: {\n  post: boolean\n  reply: boolean\n}): boolean => post || reply\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/hydration/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport {\n  AtUriString,\n  Cid,\n  Infer,\n  LexParseOptions,\n  LexValue,\n  RecordSchema,\n  Schema,\n  TypedLexMap,\n  ValidateOptions,\n  lexParse,\n  parseCidSafe,\n} from '@atproto/lex'\nimport { AtUri } from '@atproto/syntax'\nimport { Record as RecordEntry } from '../proto/bsky_pb'\n\nexport class HydrationMap<K, T> extends Map<K, T | null> implements Merges {\n  merge(map: HydrationMap<K, T>): this {\n    for (const [key, val] of map) {\n      this.set(key, val)\n    }\n    return this\n  }\n}\n\nexport interface Merges {\n  merge<T extends this>(map: T): this\n}\n\nexport type RecordInfo<T extends { $type: string }> = {\n  record: T & TypedLexMap\n  cid: string\n  sortedAt: Date\n  indexedAt: Date\n  takedownRef: string | undefined\n}\n\nexport const mergeMaps = <V extends HydrationMap<any, any>>(\n  mapA?: V,\n  mapB?: V,\n): V | undefined => {\n  if (!mapA) return mapB\n  if (!mapB) return mapA\n  return mapA.merge(mapB)\n}\n\nexport const mergeNestedMaps = <K, V extends HydrationMap<any, any>>(\n  mapA?: HydrationMap<K, V>,\n  mapB?: HydrationMap<K, V>,\n): HydrationMap<K, V> | undefined => {\n  if (!mapA) return mapB\n  if (!mapB) return mapA\n\n  for (const [key, map] of mapB) {\n    const merged = mergeMaps(mapA.get(key) ?? undefined, map ?? undefined)\n    mapA.set(key, merged ?? null)\n  }\n\n  return mapA\n}\n\nexport const mergeManyMaps = <K, T>(...maps: HydrationMap<K, T>[]) => {\n  return maps.reduce(mergeMaps, undefined as HydrationMap<K, T> | undefined)\n}\n\nexport type ItemRef = { uri: AtUriString; cid?: string }\n\nexport function parseRecord<TSchema extends RecordSchema>(\n  recordSchema: TSchema,\n  recordEntry: RecordEntry,\n  includeTakedowns: boolean,\n): RecordInfo<Infer<TSchema>> | undefined {\n  if (!includeTakedowns && recordEntry.takenDown) {\n    return undefined\n  }\n\n  const cid = recordEntry.cid\n  if (!cid) return\n\n  const record = parseJsonBytes(recordSchema, recordEntry.record)\n  if (!record) {\n    return\n  }\n\n  return {\n    record,\n    cid,\n    sortedAt: parseDate(recordEntry.sortedAt) ?? new Date(0),\n    indexedAt: parseDate(recordEntry.indexedAt) ?? new Date(0),\n    takedownRef: safeTakedownRef(recordEntry),\n  }\n}\n\nexport const parseJsonBytes = <TSchema extends Schema<LexValue>>(\n  schema: TSchema,\n  bytes: Uint8Array | undefined,\n  options: LexParseOptions & ValidateOptions = { strict: false },\n): Infer<TSchema> | undefined => {\n  if (!bytes || bytes.byteLength === 0) return undefined\n\n  // @NOTE Buffer.from(bytes) creates a copy of the ArrayBuffer\n  const jsonBuffer = Buffer.from(\n    bytes.buffer,\n    bytes.byteOffset,\n    bytes.byteLength,\n  )\n  const jsonString = jsonBuffer.toString('utf8')\n\n  const value = lexParse(jsonString, options)\n  return schema.ifMatches(value, options)\n}\n\nexport const parseString = <T extends string | undefined>(\n  str: undefined | string,\n): T | undefined => {\n  return str ? (str as T) : undefined\n}\n\nexport const parseCid = (cidStr: string | undefined): Cid | null => {\n  if (!cidStr) return null\n  return parseCidSafe(cidStr)\n}\n\nexport const parseDate = (\n  timestamp: Timestamp | undefined,\n): Date | undefined => {\n  if (!timestamp) return undefined\n  const date = timestamp.toDate()\n  // Check for year 1 (0001-01-01 00:00:00 UTC) which is -62135596800000ms from epoch.\n  // The Go dataplane gives us those values as they come from the Go zero-value for dates.\n  if (date.getTime() === -62135596800000) return undefined\n  return date\n}\n\nexport const urisByCollection = <T extends string>(\n  uris: Iterable<T>,\n): Map<string, T[]> => {\n  const result = new Map<string, T[]>()\n  for (const uri of uris) {\n    const collection = new AtUri(uri).collection\n    const items = result.get(collection) ?? []\n    items.push(uri)\n    result.set(collection, items)\n  }\n  return result\n}\n\nexport const split = <T>(\n  items: T[],\n  predicate: (item: T) => boolean,\n): [T[], T[]] => {\n  const yes: T[] = []\n  const no: T[] = []\n  for (const item of items) {\n    if (predicate(item)) {\n      yes.push(item)\n    } else {\n      no.push(item)\n    }\n  }\n  return [yes, no]\n}\n\nexport const safeTakedownRef = (obj?: {\n  takenDown: boolean\n  takedownRef: string\n}): string | undefined => {\n  if (!obj) return\n  if (obj.takedownRef) return obj.takedownRef\n  if (obj.takenDown) return 'BSKY-TAKEDOWN-UNKNOWN'\n}\n\nexport const isActivitySubscriptionEnabled = ({\n  post,\n  reply,\n}: {\n  post: boolean\n  reply: boolean\n}): boolean => post || reply\n"]}

package/dist/image/uri.d.ts

@@ -1,10 +1,11 @@
+import { UriString } from '@atproto/lex';
 import { Options } from './util';
 export type ImagePreset = 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize';
 export declare class ImageUriBuilder {
-    endpoint: string;
+    endpoint: UriString;
     constructor(endpoint: string);
     static presets: ImagePreset[];
-    getPresetUri(id: ImagePreset, did: string, cid: string): string;
+    getPresetUri(id: ImagePreset, did: string, cid: string): UriString;
     static getPath(opts: {
         preset: ImagePreset;
     } & BlobLocation): string;

package/dist/image/uri.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../src/image/uri.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGhC,MAAM,MAAM,WAAW,GACnB,QAAQ,GACR,QAAQ,GACR,gBAAgB,GAChB,eAAe,CAAA;AAInB,qBAAa,eAAe;IACP,QAAQ,EAAE,MAAM;gBAAhB,QAAQ,EAAE,MAAM;IAEnC,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAK5B;IAED,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAS/D,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,GAAG,YAAY;IAI3D,MAAM,CAAC,UAAU,CACf,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,YAAY,GAAG;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE;CA0BpD;AAED,KAAK,YAAY,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhD,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAI1C,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,CA6BhD,CAAA"}
+{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../src/image/uri.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAe,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGhC,MAAM,MAAM,WAAW,GACnB,QAAQ,GACR,QAAQ,GACR,gBAAgB,GAChB,eAAe,CAAA;AAInB,qBAAa,eAAe;IACnB,QAAQ,EAAE,SAAS,CAAA;gBAEd,QAAQ,EAAE,MAAM;IAO5B,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,CAK5B;IAED,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS;IAelE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,GAAG,YAAY;IAI3D,MAAM,CAAC,UAAU,CACf,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,YAAY,GAAG;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE;CA0BpD;AAED,KAAK,YAAY,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhD,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAI1C,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,CA6BhD,CAAA"}

package/dist/image/uri.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.presets = exports.BadPathError = exports.ImageUriBuilder = void 0;
+const lex_1 = require("@atproto/lex");
 const PATH_REGEX = /^\/(.+?)\/plain\/(.+?)\/(.+?)(?:@(.+?))?$/;
 class ImageUriBuilder {
     constructor(endpoint) {
@@ -8,15 +9,24 @@ class ImageUriBuilder {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: endpoint
+            value: void 0
         });
+        if (!(0, lex_1.isUriString)(endpoint)) {
+            throw new Error('ImageUriBuilder endpoint must be a valid UriString');
+        }
+        this.endpoint = endpoint;
     }
     getPresetUri(id, did, cid) {
         const options = exports.presets[id];
         if (!options) {
             throw new Error(`Unrecognized requested common uri type: ${id}`);
         }
-        return this.endpoint + ImageUriBuilder.getPath({ preset: id, did, cid });
+        const path = ImageUriBuilder.getPath({
+            preset: id,
+            did,
+            cid,
+        });
+        return `${this.endpoint}${path}`;
     }
     static getPath(opts) {
         return `/${opts.preset}/plain/${opts.did}/${opts.cid}`;

package/dist/image/uri.js.map

@@ -1 +1 @@
-{"version":3,"file":"uri.js","sourceRoot":"","sources":["../../src/image/uri.ts"],"names":[],"mappings":";;;AASA,MAAM,UAAU,GAAG,2CAA2C,CAAA;AAE9D,MAAa,eAAe;IAC1B,YAAmB,QAAgB;QAAvB;;;;mBAAO,QAAQ;WAAQ;IAAG,CAAC;IASvC,YAAY,CAAC,EAAe,EAAE,GAAW,EAAE,GAAW;QACpD,MAAM,OAAO,GAAG,eAAO,CAAC,EAAE,CAAC,CAAA;QAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,IAA4C;QACzD,OAAO,IAAI,IAAI,CAAC,MAAM,UAAU,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;IACxD,CAAC;IAED,MAAM,CAAC,UAAU,CACf,IAAY;QAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACpC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,YAAY,CAAC,cAAc,CAAC,CAAA;QACxC,CAAC;QACD,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,KAAK,CAAA;QACtD,IAAI,CAAE,eAAe,CAAC,OAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,YAAY,CAAC,0BAA0B,CAAC,CAAA;QACpD,CAAC;QACD,IACE,YAAY,KAAK,SAAS;YAC1B,YAAY,KAAK,MAAM;YACvB,YAAY,KAAK,MAAM,EACvB,CAAC;YACD,MAAM,IAAI,YAAY,CAAC,0BAA0B,CAAC,CAAA;QACpD,CAAC;QACD,MAAM,MAAM,GAAG,YAA2B,CAAA;QAC1C,MAAM,MAAM,GAAG,YAAiC,CAAA;QAChD,OAAO;YACL,GAAG,eAAO,CAAC,MAAM,CAAC;YAClB,MAAM,EAAE,MAAM,IAAI,eAAO,CAAC,MAAM,CAAC,CAAC,MAAM;YACxC,GAAG;YACH,GAAG;YACH,MAAM;SACP,CAAA;IACH,CAAC;;AAlDH,0CAmDC;AAhDQ;;;;WAAyB;QAC9B,QAAQ;QACR,QAAQ;QACR,gBAAgB;QAChB,eAAe;KAChB;EALa,CAKb;AA+CH,MAAa,YAAa,SAAQ,KAAK;CAAG;AAA1C,oCAA0C;AAE1C,uEAAuE;AACvE,sEAAsE;AACzD,QAAA,OAAO,GAAiC;IACnD,MAAM,EAAE;QACN,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,OAAO;QACZ,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAI;KACV;IACD,MAAM,EAAE;QACN,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,OAAO;QACZ,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAI;KACV;IACD,cAAc,EAAE;QACd,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,QAAQ;QACb,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAI;KACV;IACD,aAAa,EAAE;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,QAAQ;QACb,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAI;KACV;CACF,CAAA","sourcesContent":["import { Options } from './util'\n\n// @NOTE if there are any additions here, ensure to include them on ImageUriBuilder.presets\nexport type ImagePreset =\n  | 'avatar'\n  | 'banner'\n  | 'feed_thumbnail'\n  | 'feed_fullsize'\n\nconst PATH_REGEX = /^\\/(.+?)\\/plain\\/(.+?)\\/(.+?)(?:@(.+?))?$/\n\nexport class ImageUriBuilder {\n  constructor(public endpoint: string) {}\n\n  static presets: ImagePreset[] = [\n    'avatar',\n    'banner',\n    'feed_thumbnail',\n    'feed_fullsize',\n  ]\n\n  getPresetUri(id: ImagePreset, did: string, cid: string): string {\n    const options = presets[id]\n    if (!options) {\n      throw new Error(`Unrecognized requested common uri type: ${id}`)\n    }\n\n    return this.endpoint + ImageUriBuilder.getPath({ preset: id, did, cid })\n  }\n\n  static getPath(opts: { preset: ImagePreset } & BlobLocation) {\n    return `/${opts.preset}/plain/${opts.did}/${opts.cid}`\n  }\n\n  static getOptions(\n    path: string,\n  ): Options & BlobLocation & { preset: ImagePreset } {\n    const match = path.match(PATH_REGEX)\n    if (!match) {\n      throw new BadPathError('Invalid path')\n    }\n    const [, presetUnsafe, did, cid, formatUnsafe] = match\n    if (!(ImageUriBuilder.presets as string[]).includes(presetUnsafe)) {\n      throw new BadPathError('Invalid path: bad preset')\n    }\n    if (\n      formatUnsafe !== undefined &&\n      formatUnsafe !== 'jpeg' &&\n      formatUnsafe !== 'webp'\n    ) {\n      throw new BadPathError('Invalid path: bad format')\n    }\n    const preset = presetUnsafe as ImagePreset\n    const format = formatUnsafe as Options['format']\n    return {\n      ...presets[preset],\n      format: format ?? presets[preset].format,\n      did,\n      cid,\n      preset,\n    }\n  }\n}\n\ntype BlobLocation = { cid: string; did: string }\n\nexport class BadPathError extends Error {}\n\n// @NOTE these prefix settings don't get used anywhere in this package,\n// but they serve as soft documentation of the behavior in production.\nexport const presets: Record<ImagePreset, Options> = {\n  avatar: {\n    format: 'webp',\n    fit: 'cover',\n    height: 1000,\n    width: 1000,\n    min: true,\n  },\n  banner: {\n    format: 'webp',\n    fit: 'cover',\n    height: 1000,\n    width: 3000,\n    min: true,\n  },\n  feed_thumbnail: {\n    format: 'webp',\n    fit: 'inside',\n    height: 2000,\n    width: 2000,\n    min: true,\n  },\n  feed_fullsize: {\n    format: 'webp',\n    fit: 'inside',\n    height: 1000,\n    width: 1000,\n    min: true,\n  },\n}\n"]}
+{"version":3,"file":"uri.js","sourceRoot":"","sources":["../../src/image/uri.ts"],"names":[],"mappings":"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","sourcesContent":["import { UriString, isUriString } from '@atproto/lex'\nimport { Options } from './util'\n\n// @NOTE if there are any additions here, ensure to include them on ImageUriBuilder.presets\nexport type ImagePreset =\n  | 'avatar'\n  | 'banner'\n  | 'feed_thumbnail'\n  | 'feed_fullsize'\n\nconst PATH_REGEX = /^\\/(.+?)\\/plain\\/(.+?)\\/(.+?)(?:@(.+?))?$/\n\nexport class ImageUriBuilder {\n  public endpoint: UriString\n\n  constructor(endpoint: string) {\n    if (!isUriString(endpoint)) {\n      throw new Error('ImageUriBuilder endpoint must be a valid UriString')\n    }\n    this.endpoint = endpoint\n  }\n\n  static presets: ImagePreset[] = [\n    'avatar',\n    'banner',\n    'feed_thumbnail',\n    'feed_fullsize',\n  ]\n\n  getPresetUri(id: ImagePreset, did: string, cid: string): UriString {\n    const options = presets[id]\n    if (!options) {\n      throw new Error(`Unrecognized requested common uri type: ${id}`)\n    }\n\n    const path = ImageUriBuilder.getPath({\n      preset: id,\n      did,\n      cid,\n    })\n\n    return `${this.endpoint}${path}`\n  }\n\n  static getPath(opts: { preset: ImagePreset } & BlobLocation) {\n    return `/${opts.preset}/plain/${opts.did}/${opts.cid}`\n  }\n\n  static getOptions(\n    path: string,\n  ): Options & BlobLocation & { preset: ImagePreset } {\n    const match = path.match(PATH_REGEX)\n    if (!match) {\n      throw new BadPathError('Invalid path')\n    }\n    const [, presetUnsafe, did, cid, formatUnsafe] = match\n    if (!(ImageUriBuilder.presets as string[]).includes(presetUnsafe)) {\n      throw new BadPathError('Invalid path: bad preset')\n    }\n    if (\n      formatUnsafe !== undefined &&\n      formatUnsafe !== 'jpeg' &&\n      formatUnsafe !== 'webp'\n    ) {\n      throw new BadPathError('Invalid path: bad format')\n    }\n    const preset = presetUnsafe as ImagePreset\n    const format = formatUnsafe as Options['format']\n    return {\n      ...presets[preset],\n      format: format ?? presets[preset].format,\n      did,\n      cid,\n      preset,\n    }\n  }\n}\n\ntype BlobLocation = { cid: string; did: string }\n\nexport class BadPathError extends Error {}\n\n// @NOTE these prefix settings don't get used anywhere in this package,\n// but they serve as soft documentation of the behavior in production.\nexport const presets: Record<ImagePreset, Options> = {\n  avatar: {\n    format: 'webp',\n    fit: 'cover',\n    height: 1000,\n    width: 1000,\n    min: true,\n  },\n  banner: {\n    format: 'webp',\n    fit: 'cover',\n    height: 1000,\n    width: 3000,\n    min: true,\n  },\n  feed_thumbnail: {\n    format: 'webp',\n    fit: 'inside',\n    height: 2000,\n    width: 2000,\n    min: true,\n  },\n  feed_fullsize: {\n    format: 'webp',\n    fit: 'inside',\n    height: 1000,\n    width: 1000,\n    min: true,\n  },\n}\n"]}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAA;AAK5B,OAAO,OAAO,MAAM,SAAS,CAAA;AAI7B,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAMzC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAoBtC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,qBAAa,WAAW;IACf,GAAG,EAAE,UAAU,CAAA;IACf,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAEvB,IAAI,EAAE;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;KAAE;IAK/D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAClB,MAAM,EAAE,YAAY,CAAA;QACpB,UAAU,EAAE,OAAO,CAAA;KACpB,GAAG,WAAW;IAyLT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IAe7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/B;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAA;AAK5B,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAQzC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAmBtC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,cAAc,cAAc,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,qBAAa,WAAW;IACf,GAAG,EAAE,UAAU,CAAA;IACf,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAEvB,IAAI,EAAE;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;KAAE;IAK/D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAClB,MAAM,EAAE,YAAY,CAAA;QACpB,UAAU,EAAE,OAAO,CAAA;KACpB,GAAG,WAAW;IA+MT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IAe7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/B;AAED,eAAe,WAAW,CAAA"}