@atproto/lexicon-resolver 0.2.5 → 0.3.0

package/dist/lexicons/com/atproto/sync.js

@@ -0,0 +1,41 @@
+"use strict";
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+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.getRecord = void 0;
+exports.getRecord = __importStar(require("./sync/getRecord.js"));
+//# sourceMappingURL=sync.js.map

package/dist/lexicons/com/atproto/sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../../src/lexicons/com/atproto/sync.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,iEAAgD","sourcesContent":["/*\n * THIS FILE WAS GENERATED BY \"@atproto/lex\". DO NOT EDIT.\n */\n\nexport * as getRecord from './sync/getRecord.js'\n"]}

package/dist/lexicons/com/atproto.d.ts

@@ -0,0 +1,3 @@
+export * as lexicon from './atproto/lexicon.js';
+export * as sync from './atproto/sync.js';
+//# sourceMappingURL=atproto.d.ts.map

package/dist/lexicons/com/atproto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"atproto.d.ts","sourceRoot":"","sources":["../../../src/lexicons/com/atproto.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAA"}

package/dist/lexicons/com/atproto.js

@@ -0,0 +1,42 @@
+"use strict";
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+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.sync = exports.lexicon = void 0;
+exports.lexicon = __importStar(require("./atproto/lexicon.js"));
+exports.sync = __importStar(require("./atproto/sync.js"));
+//# sourceMappingURL=atproto.js.map

package/dist/lexicons/com/atproto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"atproto.js","sourceRoot":"","sources":["../../../src/lexicons/com/atproto.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gEAA+C;AAC/C,0DAAyC","sourcesContent":["/*\n * THIS FILE WAS GENERATED BY \"@atproto/lex\". DO NOT EDIT.\n */\n\nexport * as lexicon from './atproto/lexicon.js'\nexport * as sync from './atproto/sync.js'\n"]}

package/dist/lexicons/com.d.ts

@@ -0,0 +1,2 @@
+export * as atproto from './com/atproto.js';
+//# sourceMappingURL=com.d.ts.map

package/dist/lexicons/com.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"com.d.ts","sourceRoot":"","sources":["../../src/lexicons/com.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA"}

package/dist/lexicons/com.js

@@ -0,0 +1,41 @@
+"use strict";
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+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.atproto = void 0;
+exports.atproto = __importStar(require("./com/atproto.js"));
+//# sourceMappingURL=com.js.map

package/dist/lexicons/com.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"com.js","sourceRoot":"","sources":["../../src/lexicons/com.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4DAA2C","sourcesContent":["/*\n * THIS FILE WAS GENERATED BY \"@atproto/lex\". DO NOT EDIT.\n */\n\nexport * as atproto from './com/atproto.js'\n"]}

package/dist/lexicons/index.d.ts

@@ -0,0 +1,2 @@
+export * as com from './com.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/lexicons/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lexicons/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA"}

package/dist/lexicons/index.js

@@ -0,0 +1,41 @@
+"use strict";
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+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.com = void 0;
+exports.com = __importStar(require("./com.js"));
+//# sourceMappingURL=index.js.map

package/dist/lexicons/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lexicons/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gDAA+B","sourcesContent":["/*\n * THIS FILE WAS GENERATED BY \"@atproto/lex\". DO NOT EDIT.\n */\n\nexport * as com from './com.js'\n"]}

package/dist/record.d.ts

@@ -1,20 +1,20 @@
-import { CID } from 'multiformats/cid';
 import { IdResolver } from '@atproto/identity';
-import { RepoRecord } from '@atproto/lexicon';
+import { AgentConfig, Cid, DidString, FetchHandler, LexMap } from '@atproto/lex';
 import { Commit } from '@atproto/repo';
-import { AtUri } from '@atproto/syntax';
-import { BuildFetchHandlerOptions, FetchHandler } from '@atproto/xrpc';
+import { AtUri, AtUriString } from '@atproto/syntax';
+export { AtUri, IdResolver };
+export type { AgentConfig, AtUriString, Cid, Commit, DidString, FetchHandler, LexMap, };
 /**
  * Resolve a record from the network.
  */
-export type RecordResolver = (uri: AtUri | string) => Promise<RecordResolution>;
+export type RecordResolver = (uri: AtUri | AtUriString) => Promise<RecordResolution>;
 /**
  * Resolve a record from the network, verifying its authenticity.
  */
-export type AtprotoRecordResolver = (uri: AtUri | string, options?: ResolveRecordOptions) => Promise<RecordResolution>;
+export type AtprotoRecordResolver = (uri: AtUri | AtUriString, options?: ResolveRecordOptions) => Promise<RecordResolution>;
 export type BuildRecordResolverOptions = {
     idResolver?: IdResolver;
-    rpc?: Partial<BuildFetchHandlerOptions> | FetchHandler;
+    rpc?: Partial<AgentConfig> | FetchHandler;
 };
 export type ResolveRecordOptions = {
     forceRefresh?: boolean;
@@ -22,10 +22,9 @@ export type ResolveRecordOptions = {
 export type RecordResolution = {
     commit: Commit;
     uri: AtUri;
-    cid: CID;
-    record: RepoRecord;
+    cid: Cid;
+    record: LexMap;
 };
-export { AtUri, CID, type Commit, IdResolver, type RepoRecord };
 /**
  * Build a record resolver function.
  */

package/dist/record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../src/record.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EACL,MAAM,EAMP,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,KAAK,EAAkB,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAKtE;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE/E;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAClC,GAAG,EAAE,KAAK,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,oBAAoB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE9B,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAAG,YAAY,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,KAAK,CAAA;IACV,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,UAAU,CAAA;CACnB,CAAA;AAED,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,CAAA;AAE/D;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,0BAA+B,GACvC,qBAAqB,CAyCvB;AAED,eAAO,MAAM,aAAa,uBAAwB,CAAA;AAElD,eAAO,MAAM,SAAS,sFAIpB,CAAA;AAEF,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAIrD"}
+{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../src/record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,mBAAmB,CAAA;AACtE,OAAO,EACL,WAAW,EACX,GAAG,EAEH,SAAS,EACT,YAAY,EACZ,MAAM,EAEP,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,MAAM,EAMP,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAIpD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;AAC5B,YAAY,EACV,WAAW,EACX,WAAW,EACX,GAAG,EACH,MAAM,EACN,SAAS,EACT,YAAY,EACZ,MAAM,GACP,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,EAAE,KAAK,GAAG,WAAW,KACrB,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE9B;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAClC,GAAG,EAAE,KAAK,GAAG,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE9B,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,YAAY,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,KAAK,CAAA;IACV,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,0BAA+B,GACvC,qBAAqB,CAoDvB;AAED,eAAO,MAAM,aAAa,uBAAwB,CAAA;AAElD,eAAO,MAAM,SAAS,sFAIpB,CAAA;AAEF,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAIrD"}

package/dist/record.js

@@ -1,18 +1,15 @@
 "use strict";
-/* eslint-disable import/no-deprecated */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecordResolutionError = exports.safeFetch = exports.resolveRecord = exports.IdResolver = exports.CID = exports.AtUri = void 0;
+exports.RecordResolutionError = exports.safeFetch = exports.resolveRecord = exports.IdResolver = exports.AtUri = void 0;
 exports.buildRecordResolver = buildRecordResolver;
-const cid_1 = require("multiformats/cid");
-Object.defineProperty(exports, "CID", { enumerable: true, get: function () { return cid_1.CID; } });
 const identity_1 = require("@atproto/identity");
 Object.defineProperty(exports, "IdResolver", { enumerable: true, get: function () { return identity_1.IdResolver; } });
+const lex_1 = require("@atproto/lex");
 const repo_1 = require("@atproto/repo");
 const syntax_1 = require("@atproto/syntax");
 Object.defineProperty(exports, "AtUri", { enumerable: true, get: function () { return syntax_1.AtUri; } });
 const fetch_node_1 = require("@atproto-labs/fetch-node");
-const index_js_1 = require("./client/index.js");
-const util_js_1 = require("./util.js");
+const index_js_1 = require("./lexicons/index.js");
 /**
  * Build a record resolver function.
  */
@@ -21,22 +18,29 @@ function buildRecordResolver(options = {}) {
     return async function resolveRecord(uriStr, opts = {}) {
         const uri = typeof uriStr === 'string' ? new syntax_1.AtUri(uriStr) : uriStr;
         const did = await getDidFromUri(uri, { idResolver });
-        const identity = await idResolver.did
-            .resolveAtprotoData(did, opts.forceRefresh)
+        const identityDoc = await idResolver.did
+            .ensureResolve(did, opts.forceRefresh)
             .catch((err) => {
             throw new RecordResolutionError('Could not resolve DID identity data', {
                 cause: err,
             });
         });
-        const client = new index_js_1.AtpBaseClient(typeof rpc === 'function'
-            ? rpc
+        const { pds, signingKey } = (0, identity_1.parseToAtprotoDocument)(identityDoc);
+        if (!pds) {
+            throw new RecordResolutionError('Incomplete DID identity data: missing pds');
+        }
+        if (!signingKey) {
+            throw new RecordResolutionError('Incomplete DID identity data: missing signing key');
+        }
+        const client = new lex_1.Client(typeof rpc === 'function'
+            ? { fetchHandler: rpc }
             : {
                 ...rpc,
-                service: rpc?.service ?? identity.pds,
+                service: rpc?.service ?? pds,
                 fetch: rpc?.fetch ?? exports.safeFetch,
             });
-        const { data: proofBytes } = await client.com.atproto.sync
-            .getRecord({
+        const proofBytes = await client
+            .call(index_js_1.com.atproto.sync.getRecord, {
             did,
             collection: uri.collection,
             rkey: uri.rkey,
@@ -48,7 +52,7 @@ function buildRecordResolver(options = {}) {
         });
         const verified = await verifyRecordProof(proofBytes, {
             uri: syntax_1.AtUri.make(did, uri.collection, uri.rkey),
-            signingKey: identity.signingKey,
+            signingKey,
         });
         return verified;
     };
@@ -67,12 +71,11 @@ class RecordResolutionError extends Error {
 }
 exports.RecordResolutionError = RecordResolutionError;
 async function getDidFromUri(uri, { idResolver }) {
-    if (uri.host.startsWith('did:')) {
-        (0, syntax_1.ensureValidDid)(uri.host);
+    if (lex_1.l.isDidString(uri.host)) {
         return uri.host;
     }
     const resolved = await idResolver.handle.resolve(uri.host);
-    if (!resolved || !(0, util_js_1.isValidDid)(resolved)) {
+    if (!resolved || !lex_1.l.isDidString(resolved)) {
         throw new RecordResolutionError('Could not resolve handle found in AT-URI');
     }
     return resolved;
@@ -99,7 +102,7 @@ async function verifyRecordProof(proofBytes, { uri, signingKey }) {
     if (!cid) {
         throw new RecordResolutionError('Record not found in proof');
     }
-    const record = await blockstore.readRecord(cid);
+    const record = (await blockstore.readRecord(cid));
     return { commit, uri, cid, record };
 }
 //# sourceMappingURL=record.js.map

package/dist/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../src/record.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable import/no-deprecated */\n\nimport { CID } from 'multiformats/cid'\nimport { IdResolver } from '@atproto/identity'\nimport { RepoRecord } from '@atproto/lexicon'\nimport {\n  Commit,\n  MST,\n  MemoryBlockstore,\n  def as repoDef,\n  readCarWithRoot,\n  verifyCommitSig,\n} from '@atproto/repo'\nimport { AtUri, ensureValidDid } from '@atproto/syntax'\nimport { BuildFetchHandlerOptions, FetchHandler } from '@atproto/xrpc'\nimport { safeFetchWrap } from '@atproto-labs/fetch-node'\nimport { AtpBaseClient as Client } from './client/index.js'\nimport { isValidDid } from './util.js'\n\n/**\n * Resolve a record from the network.\n */\nexport type RecordResolver = (uri: AtUri | string) => Promise<RecordResolution>\n\n/**\n * Resolve a record from the network, verifying its authenticity.\n */\nexport type AtprotoRecordResolver = (\n  uri: AtUri | string,\n  options?: ResolveRecordOptions,\n) => Promise<RecordResolution>\n\nexport type BuildRecordResolverOptions = {\n  idResolver?: IdResolver\n  rpc?: Partial<BuildFetchHandlerOptions> | FetchHandler\n}\n\nexport type ResolveRecordOptions = {\n  forceRefresh?: boolean\n}\n\nexport type RecordResolution = {\n  commit: Commit\n  uri: AtUri\n  cid: CID\n  record: RepoRecord\n}\n\nexport { AtUri, CID, type Commit, IdResolver, type RepoRecord }\n\n/**\n * Build a record resolver function.\n */\nexport function buildRecordResolver(\n  options: BuildRecordResolverOptions = {},\n): AtprotoRecordResolver {\n  const { idResolver = new IdResolver(), rpc } = options\n  return async function resolveRecord(\n    uriStr: AtUri | string,\n    opts: ResolveRecordOptions = {},\n  ): Promise<RecordResolution> {\n    const uri = typeof uriStr === 'string' ? new AtUri(uriStr) : uriStr\n    const did = await getDidFromUri(uri, { idResolver })\n    const identity = await idResolver.did\n      .resolveAtprotoData(did, opts.forceRefresh)\n      .catch((err) => {\n        throw new RecordResolutionError('Could not resolve DID identity data', {\n          cause: err,\n        })\n      })\n    const client = new Client(\n      typeof rpc === 'function'\n        ? rpc\n        : {\n            ...rpc,\n            service: rpc?.service ?? identity.pds,\n            fetch: rpc?.fetch ?? safeFetch,\n          },\n    )\n    const { data: proofBytes } = await client.com.atproto.sync\n      .getRecord({\n        did,\n        collection: uri.collection,\n        rkey: uri.rkey,\n      })\n      .catch((err) => {\n        throw new RecordResolutionError('Could not fetch record proof', {\n          cause: err,\n        })\n      })\n    const verified = await verifyRecordProof(proofBytes, {\n      uri: AtUri.make(did, uri.collection, uri.rkey),\n      signingKey: identity.signingKey,\n    })\n    return verified\n  }\n}\n\nexport const resolveRecord = buildRecordResolver()\n\nexport const safeFetch = safeFetchWrap({\n  allowIpHost: false,\n  allowImplicitRedirect: true,\n  responseMaxSize: (1024 + 10) * 1024, // 1MB + 10kB, just a bit larger than max record size\n})\n\nexport class RecordResolutionError extends Error {\n  constructor(message?: string, options?: ErrorOptions) {\n    super(message, options)\n    this.name = 'RecordResolutionError'\n  }\n}\n\nasync function getDidFromUri(\n  uri: AtUri,\n  { idResolver }: { idResolver: IdResolver },\n) {\n  if (uri.host.startsWith('did:')) {\n    ensureValidDid(uri.host)\n    return uri.host\n  }\n  const resolved = await idResolver.handle.resolve(uri.host)\n  if (!resolved || !isValidDid(resolved)) {\n    throw new RecordResolutionError('Could not resolve handle found in AT-URI')\n  }\n  return resolved\n}\n\nasync function verifyRecordProof(\n  proofBytes: Uint8Array,\n  { uri, signingKey }: { uri: AtUri; signingKey: string },\n) {\n  const { root, blocks } = await readCarWithRoot(proofBytes).catch((err) => {\n    throw new RecordResolutionError('Malformed record proof', { cause: err })\n  })\n  const blockstore = new MemoryBlockstore(blocks)\n  const commit = await blockstore.readObj(root, repoDef.commit).catch((err) => {\n    throw new RecordResolutionError('Invalid commit in record proof', {\n      cause: err,\n    })\n  })\n  if (commit.did !== uri.host) {\n    throw new RecordResolutionError(`Invalid repo did: ${commit.did}`)\n  }\n  const validSig = await verifyCommitSig(commit, signingKey)\n  if (!validSig) {\n    throw new RecordResolutionError(\n      `Invalid signature on commit: ${root.toString()}`,\n    )\n  }\n  const mst = MST.load(blockstore, commit.data)\n  const cid = await mst.get(`${uri.collection}/${uri.rkey}`)\n  if (!cid) {\n    throw new RecordResolutionError('Record not found in proof')\n  }\n  const record = await blockstore.readRecord(cid)\n  return { commit, uri, cid, record }\n}\n"]}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../src/record.ts"],"names":[],"mappings":"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","sourcesContent":["import { IdResolver, parseToAtprotoDocument } from '@atproto/identity'\nimport {\n  AgentConfig,\n  Cid,\n  Client,\n  DidString,\n  FetchHandler,\n  LexMap,\n  l,\n} from '@atproto/lex'\nimport {\n  Commit,\n  MST,\n  MemoryBlockstore,\n  def as repoDef,\n  readCarWithRoot,\n  verifyCommitSig,\n} from '@atproto/repo'\nimport { AtUri, AtUriString } from '@atproto/syntax'\nimport { safeFetchWrap } from '@atproto-labs/fetch-node'\nimport { com } from './lexicons/index.js'\n\nexport { AtUri, IdResolver }\nexport type {\n  AgentConfig,\n  AtUriString,\n  Cid,\n  Commit,\n  DidString,\n  FetchHandler,\n  LexMap,\n}\n\n/**\n * Resolve a record from the network.\n */\nexport type RecordResolver = (\n  uri: AtUri | AtUriString,\n) => Promise<RecordResolution>\n\n/**\n * Resolve a record from the network, verifying its authenticity.\n */\nexport type AtprotoRecordResolver = (\n  uri: AtUri | AtUriString,\n  options?: ResolveRecordOptions,\n) => Promise<RecordResolution>\n\nexport type BuildRecordResolverOptions = {\n  idResolver?: IdResolver\n  rpc?: Partial<AgentConfig> | FetchHandler\n}\n\nexport type ResolveRecordOptions = {\n  forceRefresh?: boolean\n}\n\nexport type RecordResolution = {\n  commit: Commit\n  uri: AtUri\n  cid: Cid\n  record: LexMap\n}\n\n/**\n * Build a record resolver function.\n */\nexport function buildRecordResolver(\n  options: BuildRecordResolverOptions = {},\n): AtprotoRecordResolver {\n  const { idResolver = new IdResolver(), rpc } = options\n  return async function resolveRecord(\n    uriStr: AtUri | AtUriString,\n    opts: ResolveRecordOptions = {},\n  ): Promise<RecordResolution> {\n    const uri = typeof uriStr === 'string' ? new AtUri(uriStr) : uriStr\n    const did = await getDidFromUri(uri, { idResolver })\n    const identityDoc = await idResolver.did\n      .ensureResolve(did, opts.forceRefresh)\n      .catch((err) => {\n        throw new RecordResolutionError('Could not resolve DID identity data', {\n          cause: err,\n        })\n      })\n    const { pds, signingKey } = parseToAtprotoDocument(identityDoc)\n    if (!pds) {\n      throw new RecordResolutionError(\n        'Incomplete DID identity data: missing pds',\n      )\n    }\n    if (!signingKey) {\n      throw new RecordResolutionError(\n        'Incomplete DID identity data: missing signing key',\n      )\n    }\n    const client = new Client(\n      typeof rpc === 'function'\n        ? { fetchHandler: rpc }\n        : {\n            ...rpc,\n            service: rpc?.service ?? pds,\n            fetch: rpc?.fetch ?? safeFetch,\n          },\n    )\n    const proofBytes = await client\n      .call(com.atproto.sync.getRecord, {\n        did,\n        collection: uri.collection as l.NsidString,\n        rkey: uri.rkey as l.RecordKeyString,\n      })\n      .catch((err) => {\n        throw new RecordResolutionError('Could not fetch record proof', {\n          cause: err,\n        })\n      })\n    const verified = await verifyRecordProof(proofBytes, {\n      uri: AtUri.make(did, uri.collection, uri.rkey),\n      signingKey,\n    })\n    return verified\n  }\n}\n\nexport const resolveRecord = buildRecordResolver()\n\nexport const safeFetch = safeFetchWrap({\n  allowIpHost: false,\n  allowImplicitRedirect: true,\n  responseMaxSize: (1024 + 10) * 1024, // 1MB + 10kB, just a bit larger than max record size\n})\n\nexport class RecordResolutionError extends Error {\n  constructor(message?: string, options?: ErrorOptions) {\n    super(message, options)\n    this.name = 'RecordResolutionError'\n  }\n}\n\nasync function getDidFromUri(\n  uri: AtUri,\n  { idResolver }: { idResolver: IdResolver },\n): Promise<DidString> {\n  if (l.isDidString(uri.host)) {\n    return uri.host\n  }\n\n  const resolved = await idResolver.handle.resolve(uri.host)\n  if (!resolved || !l.isDidString(resolved)) {\n    throw new RecordResolutionError('Could not resolve handle found in AT-URI')\n  }\n\n  return resolved\n}\n\nasync function verifyRecordProof(\n  proofBytes: Uint8Array,\n  { uri, signingKey }: { uri: AtUri; signingKey: string },\n): Promise<RecordResolution> {\n  const { root, blocks } = await readCarWithRoot(proofBytes).catch((err) => {\n    throw new RecordResolutionError('Malformed record proof', { cause: err })\n  })\n  const blockstore = new MemoryBlockstore(blocks)\n  const commit = await blockstore.readObj(root, repoDef.commit).catch((err) => {\n    throw new RecordResolutionError('Invalid commit in record proof', {\n      cause: err,\n    })\n  })\n  if (commit.did !== uri.host) {\n    throw new RecordResolutionError(`Invalid repo did: ${commit.did}`)\n  }\n  const validSig = await verifyCommitSig(commit, signingKey)\n  if (!validSig) {\n    throw new RecordResolutionError(\n      `Invalid signature on commit: ${root.toString()}`,\n    )\n  }\n  const mst = MST.load(blockstore, commit.data)\n  const cid = await mst.get(`${uri.collection}/${uri.rkey}`)\n  if (!cid) {\n    throw new RecordResolutionError('Record not found in proof')\n  }\n  const record = (await blockstore.readRecord(cid)) as LexMap\n  return { commit, uri, cid, record }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lexicon-resolver",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "type": "commonjs",
   "license": "MIT",
   "description": "ATProto Lexicon resolution",
@@ -23,23 +23,21 @@
     }
   },
   "dependencies": {
-    "multiformats": "^9.9.0",
     "@atproto-labs/fetch-node": "^0.2.0",
-    "@atproto/identity": "^0.4.10",
-    "@atproto/lexicon": "^0.6.0",
+    "@atproto/lex": "^0.0.20",
+    "@atproto/identity": "^0.4.12",
+    "@atproto/lex-document": "^0.0.15",
     "@atproto/repo": "^0.8.12",
-    "@atproto/syntax": "^0.4.2",
-    "@atproto/xrpc": "^0.7.7"
+    "@atproto/syntax": "^0.5.0"
   },
   "devDependencies": {
     "jest": "^28.1.2",
     "typescript": "^5.6.3",
-    "@atproto/common": "^0.5.3",
-    "@atproto/lex-cli": "^0.9.8"
+    "@atproto/lex-cbor": "^0.0.14"
   },
   "scripts": {
     "test": "jest",
     "build": "tsc --build tsconfig.build.json",
-    "codegen": "lex gen-api --yes ./src/client ../../lexicons/com/atproto/sync/getRecord.json"
+    "codegen": "lex build --indexFile --lexicons ../../lexicons --clear --include com.atproto.sync.getRecord --include com.atproto.lexicon.schema"
   }
 }

package/src/lexicon.ts

@@ -1,56 +1,52 @@
 import dns from 'node:dns/promises'
-import { CID } from 'multiformats/cid'
-import { LexiconDoc, parseLexiconDoc } from '@atproto/lexicon'
+import { Cid, l } from '@atproto/lex'
+import { LexiconDocument, lexiconDocumentSchema } from '@atproto/lex-document'
 import { Commit } from '@atproto/repo'
-import { AtUri, NSID, ensureValidDid } from '@atproto/syntax'
+import { AtUri, DidString, NSID, NsidString } from '@atproto/syntax'
+import * as lexiconsSchema from './lexicons/com/atproto/lexicon/schema.js'
 import {
   BuildRecordResolverOptions,
   ResolveRecordOptions,
   buildRecordResolver,
 } from './record.js'
-import { isValidDid } from './util.js'
 
 const DNS_SUBDOMAIN = '_lexicon'
 const DNS_PREFIX = 'did='
-export const LEXICON_SCHEMA_NSID = 'com.atproto.lexicon.schema'
+
+export type LexiconDocumentRecord = lexiconsSchema.Main & LexiconDocument
+export const LEXICON_SCHEMA_NSID = lexiconsSchema.$nsid
 
 /**
  * Resolve Lexicon from an NSID
  */
 export type LexiconResolver = (
-  nsid: NSID | string,
+  nsid: NSID | NsidString,
 ) => Promise<LexiconResolution>
 
 /**
  * Resolve Lexicon from an NSID using Lexicon DID authority and record resolution
  */
 export type AtprotoLexiconResolver = (
-  nsid: NSID | string,
+  nsid: NSID | NsidString,
   options?: ResolveLexiconOptions,
 ) => Promise<LexiconResolution>
 
 export type BuildLexiconResolverOptions = BuildRecordResolverOptions
 
 export type ResolveLexiconOptions = ResolveRecordOptions & {
-  didAuthority?: string
+  didAuthority?: DidString
 }
 
 export type LexiconResolution = {
   commit: Commit
   uri: AtUri
-  cid: CID
+  cid: Cid
   nsid: NSID
-  lexicon: LexiconDoc & LexiconSchemaRecord
+  lexicon: LexiconDocumentRecord
 }
 
-export {
-  AtUri,
-  CID,
-  type Commit,
-  type LexiconDoc,
-  type LexiconSchemaRecord,
-  NSID,
-}
+export { AtUri, NSID }
+export type { Cid, Commit, DidString, LexiconDocument, NsidString }
 
 /**
  * Build a Lexicon resolver function.
@@ -60,13 +56,13 @@ export function buildLexiconResolver(
 ): AtprotoLexiconResolver {
   const resolveRecord = buildRecordResolver(options)
   return async function (
-    input: NSID | string,
+    input: NSID | NsidString,
     opts: ResolveLexiconOptions = {},
   ): Promise<LexiconResolution> {
     const nsid = NSID.from(input)
     const didAuthority = await getDidAuthority(nsid, opts)
     const verified = await resolveRecord(
-      AtUri.make(didAuthority, LEXICON_SCHEMA_NSID, nsid.toString()),
+      AtUri.make(didAuthority, lexiconsSchema.$nsid, nsid.toString()),
       { forceRefresh: opts.forceRefresh },
     ).catch((err) => {
       throw new LexiconResolutionError(
@@ -75,17 +71,19 @@ export function buildLexiconResolver(
         { cause: err },
       )
     })
-    let lexicon: LexiconDoc
-    try {
-      lexicon = parseLexiconDoc(verified.record)
-    } catch (err) {
+
+    if (!lexiconsSchema.$matches(verified.record)) {
+      throw new LexiconResolutionError(nsid, 'Invalid Lexicon schema record')
+    }
+
+    const validationResult = lexiconDocumentSchema.safeValidate(verified.record)
+    if (!validationResult.success) {
       throw new LexiconResolutionError(nsid, 'Invalid Lexicon document', {
-        cause: err,
+        cause: validationResult.reason,
       })
     }
-    if (!isLexiconSchemaRecord(lexicon)) {
-      throw new LexiconResolutionError(nsid, 'Invalid Lexicon schema record')
-    }
+
+    const lexicon = validationResult.value
     if (lexicon.id !== nsid.toString()) {
       throw new LexiconResolutionError(
         nsid,
@@ -104,11 +102,11 @@ export const resolveLexicon = buildLexiconResolver()
  * @param input NSID or string representing one for which to lookup its Lexicon DID authority.
  */
 export async function resolveLexiconDidAuthority(
-  input: NSID | string,
-): Promise<string | undefined> {
+  input: NSID | NsidString,
+): Promise<DidString | undefined> {
   const nsid = NSID.from(input)
   const did = await resolveDns(nsid.authority)
-  if (did == null || !isValidDid(did)) return
+  if (did == null || !l.isDidString(did)) return
   return did
 }
 
@@ -134,7 +132,6 @@ export class LexiconResolutionError extends Error {
 
 async function getDidAuthority(nsid: NSID, options: ResolveLexiconOptions) {
   if (options.didAuthority) {
-    ensureValidDid(options.didAuthority)
     return options.didAuthority
   }
   const did = await resolveLexiconDidAuthority(nsid)
@@ -165,8 +162,3 @@ function parseDnsResult(chunkedResults: string[][]): string | undefined {
   }
   return found[0].slice(DNS_PREFIX.length)
 }
-
-type LexiconSchemaRecord = { $type: typeof LEXICON_SCHEMA_NSID }
-function isLexiconSchemaRecord(v: unknown): v is LexiconSchemaRecord {
-  return v?.['$type'] === LEXICON_SCHEMA_NSID
-}

package/src/lexicons/com/atproto/lexicon/schema.defs.ts

@@ -0,0 +1,43 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'com.atproto.lexicon.schema'
+
+export { $nsid }
+
+/** Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc). */
+type Main = {
+  $type: 'com.atproto.lexicon.schema'
+
+  /**
+   * Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system.
+   */
+  lexicon: number
+}
+
+export type { Main }
+
+/** Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc). */
+const main = l.record<'nsid', Main>(
+  'nsid',
+  $nsid,
+  l.object({ lexicon: l.integer() }),
+)
+
+export { main }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main),
+  $build = /*#__PURE__*/ main.build.bind(main),
+  $type = /*#__PURE__*/ main.$type
+export const $assert = /*#__PURE__*/ main.assert.bind(main),
+  $check = /*#__PURE__*/ main.check.bind(main),
+  $cast = /*#__PURE__*/ main.cast.bind(main),
+  $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main),
+  $matches = /*#__PURE__*/ main.matches.bind(main),
+  $parse = /*#__PURE__*/ main.parse.bind(main),
+  $safeParse = /*#__PURE__*/ main.safeParse.bind(main),
+  $validate = /*#__PURE__*/ main.validate.bind(main),
+  $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)

package/src/lexicons/com/atproto/lexicon/schema.ts

@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './schema.defs.js'
+export * as $defs from './schema.defs.js'

package/src/lexicons/com/atproto/lexicon.ts

@@ -0,0 +1,5 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * as schema from './lexicon/schema.js'