@atproto/identity 0.4.12 → 0.5.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atproto/identity
 
+## 0.5.0-next.0
+
+### Minor Changes
+
+- [#4929](https://github.com/bluesky-social/atproto/pull/4929) [`bb7491c`](https://github.com/bluesky-social/atproto/commit/bb7491c29e06181e1d2f8cf6eb454f9bb8ab961b) Thanks [@devinivy](https://github.com/devinivy)! - **BREAKING:** Drop support for Node.js 18 and 20. Node.js 22 is now the minimum supported version. Docker images now use Node.js 24.
+
+- [#4943](https://github.com/bluesky-social/atproto/pull/4943) [`07ae5d4`](https://github.com/bluesky-social/atproto/commit/07ae5d4452df51e045e0239da7a04cf0bc154028) Thanks [@devinivy](https://github.com/devinivy)! - **BREAKING:** Convert to pure ESM. All packages now ship `"type": "module"` with ES module output and Node16 module resolution.
+
+  Node.js 22's `require()` compatibility layer can still load these packages in CommonJS code.
+
+- [#4930](https://github.com/bluesky-social/atproto/pull/4930) [`042df15`](https://github.com/bluesky-social/atproto/commit/042df15087c0e62cd1e715fcbf58852fab875af9) Thanks [@devinivy](https://github.com/devinivy)! - Build with TypeScript 6.0. Emitted `.d.ts` files now use TypeScript 6's stricter `Uint8Array<ArrayBuffer>` typing in places where Web/Node APIs require buffer-backed (not shared-memory) byte arrays. Consumers compiling against these types on older TypeScript should see no runtime impact, but may need to widen or cast in spots that previously relied on `Uint8Array` defaulting to `<ArrayBufferLike>`.
+
+  Internal: tsconfig `moduleResolution: "node"` is silenced via `ignoreDeprecations: "6.0"` for now; the proper migration to `node16`/`bundler` resolution is deferred.
+
+### Patch Changes
+
+- Updated dependencies [[`bb7491c`](https://github.com/bluesky-social/atproto/commit/bb7491c29e06181e1d2f8cf6eb454f9bb8ab961b), [`07ae5d4`](https://github.com/bluesky-social/atproto/commit/07ae5d4452df51e045e0239da7a04cf0bc154028), [`042df15`](https://github.com/bluesky-social/atproto/commit/042df15087c0e62cd1e715fcbf58852fab875af9)]:
+  - @atproto/common-web@0.5.0-next.0
+  - @atproto/crypto@0.5.0-next.0
+
 ## 0.4.12
 
 ### Patch Changes

package/dist/did/atproto-data.d.ts

@@ -1,5 +1,5 @@
 import { getDid, getFeedGenEndpoint, getHandle, getNotifEndpoint, getPdsEndpoint } from '@atproto/common-web';
-import { AtprotoData, DidDocument } from '../types';
+import { AtprotoData, DidDocument } from '../types.js';
 export { getDid, getFeedGenEndpoint as getFeedGen, getHandle, getNotifEndpoint as getNotif, getPdsEndpoint as getPds, };
 export declare const getKey: (doc: DidDocument) => string | undefined;
 export declare const getDidKeyFromMultibase: (key: {

package/dist/did/atproto-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atproto-data.d.ts","sourceRoot":"","sources":["../../src/did/atproto-data.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,gBAAgB,EAChB,cAAc,EAEf,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEnD,OAAO,EACL,MAAM,EACN,kBAAkB,IAAI,UAAU,EAChC,SAAS,EACT,gBAAgB,IAAI,QAAQ,EAC5B,cAAc,IAAI,MAAM,GACzB,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,KAAK,WAAW,KAAG,MAAM,GAAG,SAIlD,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,KAAK;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;CAC3B,KAAG,MAAM,GAAG,SAYZ,CAAA;AAED,eAAO,MAAM,sBAAsB,GACjC,KAAK,WAAW,KACf,OAAO,CAAC,WAAW,CAQrB,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,KAAK,WAAW,KAAG,WAepD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,KAAK,WAAW,KAAG,MAMnD,CAAA"}
+{"version":3,"file":"atproto-data.d.ts","sourceRoot":"","sources":["../../src/did/atproto-data.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,gBAAgB,EAChB,cAAc,EAEf,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEtD,OAAO,EACL,MAAM,EACN,kBAAkB,IAAI,UAAU,EAChC,SAAS,EACT,gBAAgB,IAAI,QAAQ,EAC5B,cAAc,IAAI,MAAM,GACzB,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,KAAK,WAAW,KAAG,MAAM,GAAG,SAIlD,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,KAAK;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;CAC3B,KAAG,MAAM,GAAG,SAYZ,CAAA;AAED,eAAO,MAAM,sBAAsB,GACjC,KAAK,WAAW,KACf,OAAO,CAAC,WAAW,CAQrB,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,KAAK,WAAW,KAAG,WAepD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,KAAK,WAAW,KAAG,MAMnD,CAAA"}

package/dist/did/atproto-data.js

@@ -1,54 +1,13 @@
-"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.ensureAtprotoKey = exports.ensureAtpDocument = exports.parseToAtprotoDocument = exports.getDidKeyFromMultibase = exports.getKey = exports.getPds = exports.getNotif = exports.getHandle = exports.getFeedGen = exports.getDid = void 0;
-const common_web_1 = require("@atproto/common-web");
-Object.defineProperty(exports, "getDid", { enumerable: true, get: function () { return common_web_1.getDid; } });
-Object.defineProperty(exports, "getFeedGen", { enumerable: true, get: function () { return common_web_1.getFeedGenEndpoint; } });
-Object.defineProperty(exports, "getHandle", { enumerable: true, get: function () { return common_web_1.getHandle; } });
-Object.defineProperty(exports, "getNotif", { enumerable: true, get: function () { return common_web_1.getNotifEndpoint; } });
-Object.defineProperty(exports, "getPds", { enumerable: true, get: function () { return common_web_1.getPdsEndpoint; } });
-const crypto = __importStar(require("@atproto/crypto"));
-const getKey = (doc) => {
-    const key = (0, common_web_1.getSigningKey)(doc);
+import { getDid, getFeedGenEndpoint, getHandle, getNotifEndpoint, getPdsEndpoint, getSigningKey, } from '@atproto/common-web';
+import * as crypto from '@atproto/crypto';
+export { getDid, getFeedGenEndpoint as getFeedGen, getHandle, getNotifEndpoint as getNotif, getPdsEndpoint as getPds, };
+export const getKey = (doc) => {
+    const key = getSigningKey(doc);
     if (!key)
         return undefined;
-    return (0, exports.getDidKeyFromMultibase)(key);
+    return getDidKeyFromMultibase(key);
 };
-exports.getKey = getKey;
-const getDidKeyFromMultibase = (key) => {
+export const getDidKeyFromMultibase = (key) => {
     const keyBytes = crypto.multibaseToBytes(key.publicKeyMultibase);
     let didKey = undefined;
     if (key.type === 'EcdsaSecp256r1VerificationKey2019') {
@@ -63,19 +22,17 @@ const getDidKeyFromMultibase = (key) => {
     }
     return didKey;
 };
-exports.getDidKeyFromMultibase = getDidKeyFromMultibase;
-const parseToAtprotoDocument = (doc) => {
-    const did = (0, common_web_1.getDid)(doc);
+export const parseToAtprotoDocument = (doc) => {
+    const did = getDid(doc);
     return {
         did,
-        signingKey: (0, exports.getKey)(doc),
-        handle: (0, common_web_1.getHandle)(doc),
-        pds: (0, common_web_1.getPdsEndpoint)(doc),
+        signingKey: getKey(doc),
+        handle: getHandle(doc),
+        pds: getPdsEndpoint(doc),
     };
 };
-exports.parseToAtprotoDocument = parseToAtprotoDocument;
-const ensureAtpDocument = (doc) => {
-    const { did, signingKey, handle, pds } = (0, exports.parseToAtprotoDocument)(doc);
+export const ensureAtpDocument = (doc) => {
+    const { did, signingKey, handle, pds } = parseToAtprotoDocument(doc);
     if (!did) {
         throw new Error(`Could not parse id from doc: ${doc}`);
     }
@@ -90,13 +47,11 @@ const ensureAtpDocument = (doc) => {
     }
     return { did, signingKey, handle, pds };
 };
-exports.ensureAtpDocument = ensureAtpDocument;
-const ensureAtprotoKey = (doc) => {
-    const { signingKey } = (0, exports.parseToAtprotoDocument)(doc);
+export const ensureAtprotoKey = (doc) => {
+    const { signingKey } = parseToAtprotoDocument(doc);
     if (!signingKey) {
         throw new Error(`Could not parse signingKey from doc: ${doc}`);
     }
     return signingKey;
 };
-exports.ensureAtprotoKey = ensureAtprotoKey;
 //# sourceMappingURL=atproto-data.js.map

package/dist/did/atproto-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"atproto-data.js","sourceRoot":"","sources":["../../src/did/atproto-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAO4B;AAK1B,uFAXA,mBAAM,OAWA;AACgB,2FAXtB,+BAAkB,OAWc;AAChC,0FAXA,sBAAS,OAWA;AACW,yFAXpB,6BAAgB,OAWY;AACV,uFAXlB,2BAAc,OAWU;AAR1B,wDAAyC;AAWlC,MAAM,MAAM,GAAG,CAAC,GAAgB,EAAsB,EAAE;IAC7D,MAAM,GAAG,GAAG,IAAA,0BAAa,EAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAA;IAC1B,OAAO,IAAA,8BAAsB,EAAC,GAAG,CAAC,CAAA;AACpC,CAAC,CAAA;AAJY,QAAA,MAAM,UAIlB;AAEM,MAAM,sBAAsB,GAAG,CAAC,GAGtC,EAAsB,EAAE;IACvB,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAChE,IAAI,MAAM,GAAuB,SAAS,CAAA;IAC1C,IAAI,GAAG,CAAC,IAAI,KAAK,mCAAmC,EAAE,CAAC;QACrD,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAC7D,CAAC;SAAM,IAAI,GAAG,CAAC,IAAI,KAAK,mCAAmC,EAAE,CAAC;QAC5D,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;IAClE,CAAC;SAAM,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QAC3D,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC9D,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAfY,QAAA,sBAAsB,0BAelC;AAEM,MAAM,sBAAsB,GAAG,CACpC,GAAgB,EACM,EAAE;IACxB,MAAM,GAAG,GAAG,IAAA,mBAAM,EAAC,GAAG,CAAC,CAAA;IACvB,OAAO;QACL,GAAG;QACH,UAAU,EAAE,IAAA,cAAM,EAAC,GAAG,CAAC;QACvB,MAAM,EAAE,IAAA,sBAAS,EAAC,GAAG,CAAC;QACtB,GAAG,EAAE,IAAA,2BAAc,EAAC,GAAG,CAAC;KACzB,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,sBAAsB,0BAUlC;AAEM,MAAM,iBAAiB,GAAG,CAAC,GAAgB,EAAe,EAAE;IACjE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,8BAAsB,EAAC,GAAG,CAAC,CAAA;IACpE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAA;IACxD,CAAC;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;IAChE,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAA;IAC5D,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,CAAA;AACzC,CAAC,CAAA;AAfY,QAAA,iBAAiB,qBAe7B;AAEM,MAAM,gBAAgB,GAAG,CAAC,GAAgB,EAAU,EAAE;IAC3D,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAsB,EAAC,GAAG,CAAC,CAAA;IAClD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAA;IAChE,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B","sourcesContent":["import {\n  getDid,\n  getFeedGenEndpoint,\n  getHandle,\n  getNotifEndpoint,\n  getPdsEndpoint,\n  getSigningKey,\n} from '@atproto/common-web'\nimport * as crypto from '@atproto/crypto'\nimport { AtprotoData, DidDocument } from '../types'\n\nexport {\n  getDid,\n  getFeedGenEndpoint as getFeedGen,\n  getHandle,\n  getNotifEndpoint as getNotif,\n  getPdsEndpoint as getPds,\n}\n\nexport const getKey = (doc: DidDocument): string | undefined => {\n  const key = getSigningKey(doc)\n  if (!key) return undefined\n  return getDidKeyFromMultibase(key)\n}\n\nexport const getDidKeyFromMultibase = (key: {\n  type: string\n  publicKeyMultibase: string\n}): string | undefined => {\n  const keyBytes = crypto.multibaseToBytes(key.publicKeyMultibase)\n  let didKey: string | undefined = undefined\n  if (key.type === 'EcdsaSecp256r1VerificationKey2019') {\n    didKey = crypto.formatDidKey(crypto.P256_JWT_ALG, keyBytes)\n  } else if (key.type === 'EcdsaSecp256k1VerificationKey2019') {\n    didKey = crypto.formatDidKey(crypto.SECP256K1_JWT_ALG, keyBytes)\n  } else if (key.type === 'Multikey') {\n    const parsed = crypto.parseMultikey(key.publicKeyMultibase)\n    didKey = crypto.formatDidKey(parsed.jwtAlg, parsed.keyBytes)\n  }\n  return didKey\n}\n\nexport const parseToAtprotoDocument = (\n  doc: DidDocument,\n): Partial<AtprotoData> => {\n  const did = getDid(doc)\n  return {\n    did,\n    signingKey: getKey(doc),\n    handle: getHandle(doc),\n    pds: getPdsEndpoint(doc),\n  }\n}\n\nexport const ensureAtpDocument = (doc: DidDocument): AtprotoData => {\n  const { did, signingKey, handle, pds } = parseToAtprotoDocument(doc)\n  if (!did) {\n    throw new Error(`Could not parse id from doc: ${doc}`)\n  }\n  if (!signingKey) {\n    throw new Error(`Could not parse signingKey from doc: ${doc}`)\n  }\n  if (!handle) {\n    throw new Error(`Could not parse handle from doc: ${doc}`)\n  }\n  if (!pds) {\n    throw new Error(`Could not parse pds from doc: ${doc}`)\n  }\n  return { did, signingKey, handle, pds }\n}\n\nexport const ensureAtprotoKey = (doc: DidDocument): string => {\n  const { signingKey } = parseToAtprotoDocument(doc)\n  if (!signingKey) {\n    throw new Error(`Could not parse signingKey from doc: ${doc}`)\n  }\n  return signingKey\n}\n"]}
+{"version":3,"file":"atproto-data.js","sourceRoot":"","sources":["../../src/did/atproto-data.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getDid,\n  getFeedGenEndpoint,\n  getHandle,\n  getNotifEndpoint,\n  getPdsEndpoint,\n  getSigningKey,\n} from '@atproto/common-web'\nimport * as crypto from '@atproto/crypto'\nimport { AtprotoData, DidDocument } from '../types.js'\n\nexport {\n  getDid,\n  getFeedGenEndpoint as getFeedGen,\n  getHandle,\n  getNotifEndpoint as getNotif,\n  getPdsEndpoint as getPds,\n}\n\nexport const getKey = (doc: DidDocument): string | undefined => {\n  const key = getSigningKey(doc)\n  if (!key) return undefined\n  return getDidKeyFromMultibase(key)\n}\n\nexport const getDidKeyFromMultibase = (key: {\n  type: string\n  publicKeyMultibase: string\n}): string | undefined => {\n  const keyBytes = crypto.multibaseToBytes(key.publicKeyMultibase)\n  let didKey: string | undefined = undefined\n  if (key.type === 'EcdsaSecp256r1VerificationKey2019') {\n    didKey = crypto.formatDidKey(crypto.P256_JWT_ALG, keyBytes)\n  } else if (key.type === 'EcdsaSecp256k1VerificationKey2019') {\n    didKey = crypto.formatDidKey(crypto.SECP256K1_JWT_ALG, keyBytes)\n  } else if (key.type === 'Multikey') {\n    const parsed = crypto.parseMultikey(key.publicKeyMultibase)\n    didKey = crypto.formatDidKey(parsed.jwtAlg, parsed.keyBytes)\n  }\n  return didKey\n}\n\nexport const parseToAtprotoDocument = (\n  doc: DidDocument,\n): Partial<AtprotoData> => {\n  const did = getDid(doc)\n  return {\n    did,\n    signingKey: getKey(doc),\n    handle: getHandle(doc),\n    pds: getPdsEndpoint(doc),\n  }\n}\n\nexport const ensureAtpDocument = (doc: DidDocument): AtprotoData => {\n  const { did, signingKey, handle, pds } = parseToAtprotoDocument(doc)\n  if (!did) {\n    throw new Error(`Could not parse id from doc: ${doc}`)\n  }\n  if (!signingKey) {\n    throw new Error(`Could not parse signingKey from doc: ${doc}`)\n  }\n  if (!handle) {\n    throw new Error(`Could not parse handle from doc: ${doc}`)\n  }\n  if (!pds) {\n    throw new Error(`Could not parse pds from doc: ${doc}`)\n  }\n  return { did, signingKey, handle, pds }\n}\n\nexport const ensureAtprotoKey = (doc: DidDocument): string => {\n  const { signingKey } = parseToAtprotoDocument(doc)\n  if (!signingKey) {\n    throw new Error(`Could not parse signingKey from doc: ${doc}`)\n  }\n  return signingKey\n}\n"]}

package/dist/did/base-resolver.d.ts

@@ -1,4 +1,4 @@
-import { AtprotoData, CacheResult, DidCache, DidDocument } from '../types';
+import { AtprotoData, CacheResult, DidCache, DidDocument } from '../types.js';
 export declare abstract class BaseResolver {
     cache?: DidCache | undefined;
     constructor(cache?: DidCache | undefined);

package/dist/did/base-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-resolver.d.ts","sourceRoot":"","sources":["../../src/did/base-resolver.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,EACX,WAAW,EACX,QAAQ,EACR,WAAW,EAEZ,MAAM,UAAU,CAAA;AAGjB,8BAAsB,YAAY;IACb,KAAK,CAAC,EAAE,QAAQ;gBAAhB,KAAK,CAAC,EAAE,QAAQ,YAAA;IAEnC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAE7D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,WAAW;IAUhD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAMxD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlE,OAAO,CACX,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAqBxB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAQtE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,CAAC;IAKjB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IASrE,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,EACf,YAAY,UAAQ,GACnB,OAAO,CAAC,OAAO,CAAC;CAIpB"}
+{"version":3,"file":"base-resolver.d.ts","sourceRoot":"","sources":["../../src/did/base-resolver.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,EACX,WAAW,EACX,QAAQ,EACR,WAAW,EAEZ,MAAM,aAAa,CAAA;AAGpB,8BAAsB,YAAY;IACb,KAAK,CAAC,EAAE,QAAQ;gBAAhB,KAAK,CAAC,EAAE,QAAQ,YAAA;IAEnC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAE7D,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,WAAW;IAUhD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAMxD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlE,OAAO,CACX,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAqBxB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAQtE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,WAAW,CAAC;IAKjB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IASrE,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,EACf,YAAY,UAAQ,GACnB,OAAO,CAAC,OAAO,CAAC;CAIpB"}

package/dist/did/base-resolver.js

@@ -1,59 +1,18 @@
-"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.BaseResolver = void 0;
-const common_web_1 = require("@atproto/common-web");
-const crypto = __importStar(require("@atproto/crypto"));
-const errors_1 = require("../errors");
-const types_1 = require("../types");
-const atprotoData = __importStar(require("./atproto-data"));
-class BaseResolver {
+import { check } from '@atproto/common-web';
+import * as crypto from '@atproto/crypto';
+import { DidNotFoundError, PoorlyFormattedDidDocumentError } from '../errors.js';
+import { didDocument, } from '../types.js';
+import * as atprotoData from './atproto-data.js';
+export class BaseResolver {
     constructor(cache) {
-        Object.defineProperty(this, "cache", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: cache
-        });
+        this.cache = cache;
     }
     validateDidDoc(did, val) {
-        if (!common_web_1.check.is(val, types_1.didDocument)) {
-            throw new errors_1.PoorlyFormattedDidDocumentError(did, val);
+        if (!check.is(val, didDocument)) {
+            throw new PoorlyFormattedDidDocumentError(did, val);
         }
         if (val.id !== did) {
-            throw new errors_1.PoorlyFormattedDidDocumentError(did, val);
+            throw new PoorlyFormattedDidDocumentError(did, val);
         }
         return val;
     }
@@ -88,7 +47,7 @@ class BaseResolver {
     async ensureResolve(did, forceRefresh = false) {
         const result = await this.resolve(did, forceRefresh);
         if (result === null) {
-            throw new errors_1.DidNotFoundError(did);
+            throw new DidNotFoundError(did);
         }
         return result;
     }
@@ -110,5 +69,4 @@ class BaseResolver {
         return crypto.verifySignature(signingKey, data, sig);
     }
 }
-exports.BaseResolver = BaseResolver;
 //# sourceMappingURL=base-resolver.js.map

package/dist/did/base-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-resolver.js","sourceRoot":"","sources":["../../src/did/base-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import { check } from '@atproto/common-web'\nimport * as crypto from '@atproto/crypto'\nimport { DidNotFoundError, PoorlyFormattedDidDocumentError } from '../errors'\nimport {\n  AtprotoData,\n  CacheResult,\n  DidCache,\n  DidDocument,\n  didDocument,\n} from '../types'\nimport * as atprotoData from './atproto-data'\n\nexport abstract class BaseResolver {\n  constructor(public cache?: DidCache) {}\n\n  abstract resolveNoCheck(did: string): Promise<unknown | null>\n\n  validateDidDoc(did: string, val: unknown): DidDocument {\n    if (!check.is(val, didDocument)) {\n      throw new PoorlyFormattedDidDocumentError(did, val)\n    }\n    if (val.id !== did) {\n      throw new PoorlyFormattedDidDocumentError(did, val)\n    }\n    return val\n  }\n\n  async resolveNoCache(did: string): Promise<DidDocument | null> {\n    const got = await this.resolveNoCheck(did)\n    if (got === null) return null\n    return this.validateDidDoc(did, got)\n  }\n\n  async refreshCache(did: string, prevResult?: CacheResult): Promise<void> {\n    await this.cache?.refreshCache(\n      did,\n      () => this.resolveNoCache(did),\n      prevResult,\n    )\n  }\n\n  async resolve(\n    did: string,\n    forceRefresh = false,\n  ): Promise<DidDocument | null> {\n    let fromCache: CacheResult | null = null\n    if (this.cache && !forceRefresh) {\n      fromCache = await this.cache.checkCache(did)\n      if (fromCache && !fromCache.expired) {\n        if (fromCache?.stale) {\n          await this.refreshCache(did, fromCache)\n        }\n        return fromCache.doc\n      }\n    }\n\n    const got = await this.resolveNoCache(did)\n    if (got === null) {\n      await this.cache?.clearEntry(did)\n      return null\n    }\n    await this.cache?.cacheDid(did, got, fromCache ?? undefined)\n    return got\n  }\n\n  async ensureResolve(did: string, forceRefresh = false): Promise<DidDocument> {\n    const result = await this.resolve(did, forceRefresh)\n    if (result === null) {\n      throw new DidNotFoundError(did)\n    }\n    return result\n  }\n\n  async resolveAtprotoData(\n    did: string,\n    forceRefresh = false,\n  ): Promise<AtprotoData> {\n    const didDocument = await this.ensureResolve(did, forceRefresh)\n    return atprotoData.ensureAtpDocument(didDocument)\n  }\n\n  async resolveAtprotoKey(did: string, forceRefresh = false): Promise<string> {\n    if (did.startsWith('did:key:')) {\n      return did\n    } else {\n      const didDocument = await this.ensureResolve(did, forceRefresh)\n      return atprotoData.ensureAtprotoKey(didDocument)\n    }\n  }\n\n  async verifySignature(\n    did: string,\n    data: Uint8Array,\n    sig: Uint8Array,\n    forceRefresh = false,\n  ): Promise<boolean> {\n    const signingKey = await this.resolveAtprotoKey(did, forceRefresh)\n    return crypto.verifySignature(signingKey, data, sig)\n  }\n}\n"]}
+{"version":3,"file":"base-resolver.js","sourceRoot":"","sources":["../../src/did/base-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import { check } from '@atproto/common-web'\nimport * as crypto from '@atproto/crypto'\nimport { DidNotFoundError, PoorlyFormattedDidDocumentError } from '../errors.js'\nimport {\n  AtprotoData,\n  CacheResult,\n  DidCache,\n  DidDocument,\n  didDocument,\n} from '../types.js'\nimport * as atprotoData from './atproto-data.js'\n\nexport abstract class BaseResolver {\n  constructor(public cache?: DidCache) {}\n\n  abstract resolveNoCheck(did: string): Promise<unknown | null>\n\n  validateDidDoc(did: string, val: unknown): DidDocument {\n    if (!check.is(val, didDocument)) {\n      throw new PoorlyFormattedDidDocumentError(did, val)\n    }\n    if (val.id !== did) {\n      throw new PoorlyFormattedDidDocumentError(did, val)\n    }\n    return val\n  }\n\n  async resolveNoCache(did: string): Promise<DidDocument | null> {\n    const got = await this.resolveNoCheck(did)\n    if (got === null) return null\n    return this.validateDidDoc(did, got)\n  }\n\n  async refreshCache(did: string, prevResult?: CacheResult): Promise<void> {\n    await this.cache?.refreshCache(\n      did,\n      () => this.resolveNoCache(did),\n      prevResult,\n    )\n  }\n\n  async resolve(\n    did: string,\n    forceRefresh = false,\n  ): Promise<DidDocument | null> {\n    let fromCache: CacheResult | null = null\n    if (this.cache && !forceRefresh) {\n      fromCache = await this.cache.checkCache(did)\n      if (fromCache && !fromCache.expired) {\n        if (fromCache?.stale) {\n          await this.refreshCache(did, fromCache)\n        }\n        return fromCache.doc\n      }\n    }\n\n    const got = await this.resolveNoCache(did)\n    if (got === null) {\n      await this.cache?.clearEntry(did)\n      return null\n    }\n    await this.cache?.cacheDid(did, got, fromCache ?? undefined)\n    return got\n  }\n\n  async ensureResolve(did: string, forceRefresh = false): Promise<DidDocument> {\n    const result = await this.resolve(did, forceRefresh)\n    if (result === null) {\n      throw new DidNotFoundError(did)\n    }\n    return result\n  }\n\n  async resolveAtprotoData(\n    did: string,\n    forceRefresh = false,\n  ): Promise<AtprotoData> {\n    const didDocument = await this.ensureResolve(did, forceRefresh)\n    return atprotoData.ensureAtpDocument(didDocument)\n  }\n\n  async resolveAtprotoKey(did: string, forceRefresh = false): Promise<string> {\n    if (did.startsWith('did:key:')) {\n      return did\n    } else {\n      const didDocument = await this.ensureResolve(did, forceRefresh)\n      return atprotoData.ensureAtprotoKey(didDocument)\n    }\n  }\n\n  async verifySignature(\n    did: string,\n    data: Uint8Array,\n    sig: Uint8Array,\n    forceRefresh = false,\n  ): Promise<boolean> {\n    const signingKey = await this.resolveAtprotoKey(did, forceRefresh)\n    return crypto.verifySignature(signingKey, data, sig)\n  }\n}\n"]}

package/dist/did/did-resolver.d.ts

@@ -1,5 +1,5 @@
-import { DidResolverOpts } from '../types';
-import { BaseResolver } from './base-resolver';
+import { DidResolverOpts } from '../types.js';
+import { BaseResolver } from './base-resolver.js';
 export declare class DidResolver extends BaseResolver {
     methods: Map<string, BaseResolver>;
     constructor(opts: DidResolverOpts);

package/dist/did/did-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"did-resolver.d.ts","sourceRoot":"","sources":["../../src/did/did-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAI9C,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;gBAEtB,IAAI,EAAE,eAAe;IAU3B,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAepD"}
+{"version":3,"file":"did-resolver.d.ts","sourceRoot":"","sources":["../../src/did/did-resolver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAIjD,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;gBAEtB,IAAI,EAAE,eAAe;IAU3B,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAepD"}

package/dist/did/did-resolver.js

@@ -1,41 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DidResolver = void 0;
-const errors_1 = require("../errors");
-const base_resolver_1 = require("./base-resolver");
-const plc_resolver_1 = require("./plc-resolver");
-const web_resolver_1 = require("./web-resolver");
-class DidResolver extends base_resolver_1.BaseResolver {
+import { PoorlyFormattedDidError, UnsupportedDidMethodError, } from '../errors.js';
+import { BaseResolver } from './base-resolver.js';
+import { DidPlcResolver } from './plc-resolver.js';
+import { DidWebResolver } from './web-resolver.js';
+export class DidResolver extends BaseResolver {
     constructor(opts) {
         super(opts.didCache);
-        Object.defineProperty(this, "methods", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         const { timeout = 3000, plcUrl = 'https://plc.directory' } = opts;
         // do not pass cache to sub-methods or we will be double caching
         this.methods = new Map([
-            ['plc', new plc_resolver_1.DidPlcResolver(plcUrl, timeout)],
-            ['web', new web_resolver_1.DidWebResolver(timeout)],
+            ['plc', new DidPlcResolver(plcUrl, timeout)],
+            ['web', new DidWebResolver(timeout)],
         ]);
     }
     async resolveNoCheck(did) {
         if (!did.startsWith('did:')) {
-            throw new errors_1.PoorlyFormattedDidError(did);
+            throw new PoorlyFormattedDidError(did);
         }
         const methodSepIdx = did.indexOf(':', 4);
         if (methodSepIdx === -1) {
-            throw new errors_1.PoorlyFormattedDidError(did);
+            throw new PoorlyFormattedDidError(did);
         }
         const methodName = did.slice(4, methodSepIdx);
         const method = this.methods.get(methodName);
         if (!method) {
-            throw new errors_1.UnsupportedDidMethodError(did);
+            throw new UnsupportedDidMethodError(did);
         }
         return method.resolveNoCheck(did);
     }
 }
-exports.DidResolver = DidResolver;
 //# sourceMappingURL=did-resolver.js.map

package/dist/did/did-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"did-resolver.js","sourceRoot":"","sources":["../../src/did/did-resolver.ts"],"names":[],"mappings":";;;AAAA,sCAA8E;AAE9E,mDAA8C;AAC9C,iDAA+C;AAC/C,iDAA+C;AAE/C,MAAa,WAAY,SAAQ,4BAAY;IAG3C,YAAY,IAAqB;QAC/B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAHtB;;;;;WAAkC;QAIhC,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,MAAM,GAAG,uBAAuB,EAAE,GAAG,IAAI,CAAA;QACjE,gEAAgE;QAChE,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC;YACrB,CAAC,KAAK,EAAE,IAAI,6BAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC5C,CAAC,KAAK,EAAE,IAAI,6BAAc,CAAC,OAAO,CAAC,CAAC;SACrC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QACxC,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,kCAAyB,CAAC,GAAG,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;CACF;AA5BD,kCA4BC","sourcesContent":["import { PoorlyFormattedDidError, UnsupportedDidMethodError } from '../errors'\nimport { DidResolverOpts } from '../types'\nimport { BaseResolver } from './base-resolver'\nimport { DidPlcResolver } from './plc-resolver'\nimport { DidWebResolver } from './web-resolver'\n\nexport class DidResolver extends BaseResolver {\n  methods: Map<string, BaseResolver>\n\n  constructor(opts: DidResolverOpts) {\n    super(opts.didCache)\n    const { timeout = 3000, plcUrl = 'https://plc.directory' } = opts\n    // do not pass cache to sub-methods or we will be double caching\n    this.methods = new Map([\n      ['plc', new DidPlcResolver(plcUrl, timeout)],\n      ['web', new DidWebResolver(timeout)],\n    ])\n  }\n\n  async resolveNoCheck(did: string): Promise<unknown> {\n    if (!did.startsWith('did:')) {\n      throw new PoorlyFormattedDidError(did)\n    }\n    const methodSepIdx = did.indexOf(':', 4)\n    if (methodSepIdx === -1) {\n      throw new PoorlyFormattedDidError(did)\n    }\n    const methodName = did.slice(4, methodSepIdx)\n    const method = this.methods.get(methodName)\n    if (!method) {\n      throw new UnsupportedDidMethodError(did)\n    }\n    return method.resolveNoCheck(did)\n  }\n}\n"]}
+{"version":3,"file":"did-resolver.js","sourceRoot":"","sources":["../../src/did/did-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,MAAM,OAAO,WAAY,SAAQ,YAAY;IAG3C,YAAY,IAAqB;QAC/B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACpB,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,MAAM,GAAG,uBAAuB,EAAE,GAAG,IAAI,CAAA;QACjE,gEAAgE;QAChE,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC;YACrB,CAAC,KAAK,EAAE,IAAI,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC5C,CAAC,KAAK,EAAE,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;SACrC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,uBAAuB,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QACxC,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,uBAAuB,CAAC,GAAG,CAAC,CAAA;QACxC,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,yBAAyB,CAAC,GAAG,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;CACF","sourcesContent":["import {\n  PoorlyFormattedDidError,\n  UnsupportedDidMethodError,\n} from '../errors.js'\nimport { DidResolverOpts } from '../types.js'\nimport { BaseResolver } from './base-resolver.js'\nimport { DidPlcResolver } from './plc-resolver.js'\nimport { DidWebResolver } from './web-resolver.js'\n\nexport class DidResolver extends BaseResolver {\n  methods: Map<string, BaseResolver>\n\n  constructor(opts: DidResolverOpts) {\n    super(opts.didCache)\n    const { timeout = 3000, plcUrl = 'https://plc.directory' } = opts\n    // do not pass cache to sub-methods or we will be double caching\n    this.methods = new Map([\n      ['plc', new DidPlcResolver(plcUrl, timeout)],\n      ['web', new DidWebResolver(timeout)],\n    ])\n  }\n\n  async resolveNoCheck(did: string): Promise<unknown> {\n    if (!did.startsWith('did:')) {\n      throw new PoorlyFormattedDidError(did)\n    }\n    const methodSepIdx = did.indexOf(':', 4)\n    if (methodSepIdx === -1) {\n      throw new PoorlyFormattedDidError(did)\n    }\n    const methodName = did.slice(4, methodSepIdx)\n    const method = this.methods.get(methodName)\n    if (!method) {\n      throw new UnsupportedDidMethodError(did)\n    }\n    return method.resolveNoCheck(did)\n  }\n}\n"]}

package/dist/did/index.d.ts

@@ -1,6 +1,6 @@
-export * from './web-resolver';
-export * from './plc-resolver';
-export * from './did-resolver';
-export * from './atproto-data';
-export * from './memory-cache';
+export * from './web-resolver.js';
+export * from './plc-resolver.js';
+export * from './did-resolver.js';
+export * from './atproto-data.js';
+export * from './memory-cache.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/did/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/did/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA"}

package/dist/did/index.js

@@ -1,22 +1,6 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./web-resolver"), exports);
-__exportStar(require("./plc-resolver"), exports);
-__exportStar(require("./did-resolver"), exports);
-__exportStar(require("./atproto-data"), exports);
-__exportStar(require("./memory-cache"), exports);
+export * from './web-resolver.js';
+export * from './plc-resolver.js';
+export * from './did-resolver.js';
+export * from './atproto-data.js';
+export * from './memory-cache.js';
 //# sourceMappingURL=index.js.map

package/dist/did/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/did/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,iDAA8B;AAC9B,iDAA8B;AAC9B,iDAA8B;AAC9B,iDAA8B","sourcesContent":["export * from './web-resolver'\nexport * from './plc-resolver'\nexport * from './did-resolver'\nexport * from './atproto-data'\nexport * from './memory-cache'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/did/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA","sourcesContent":["export * from './web-resolver.js'\nexport * from './plc-resolver.js'\nexport * from './did-resolver.js'\nexport * from './atproto-data.js'\nexport * from './memory-cache.js'\n"]}

package/dist/did/memory-cache.d.ts

@@ -1,4 +1,4 @@
-import { CacheResult, DidCache, DidDocument } from '../types';
+import { CacheResult, DidCache, DidDocument } from '../types.js';
 type CacheVal = {
     doc: DidDocument;
     updatedAt: number;

package/dist/did/memory-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory-cache.d.ts","sourceRoot":"","sources":["../../src/did/memory-cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE7D,KAAK,QAAQ,GAAG;IACd,GAAG,EAAE,WAAW,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,qBAAa,WAAY,YAAW,QAAQ;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;gBACT,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAKvC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAY;IAEzC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC;IAOV,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAcpD,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"memory-cache.d.ts","sourceRoot":"","sources":["../../src/did/memory-cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEhE,KAAK,QAAQ,GAAG;IACd,GAAG,EAAE,WAAW,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,qBAAa,WAAY,YAAW,QAAQ;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;gBACT,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAKvC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAY;IAEzC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC;IAOV,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAcpD,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

package/dist/did/memory-cache.js

@@ -1,29 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoryCache = void 0;
-const common_web_1 = require("@atproto/common-web");
-class MemoryCache {
+import { DAY, HOUR } from '@atproto/common-web';
+export class MemoryCache {
     constructor(staleTTL, maxTTL) {
-        Object.defineProperty(this, "staleTTL", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "maxTTL", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cache", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Map()
-        });
-        this.staleTTL = staleTTL ?? common_web_1.HOUR;
-        this.maxTTL = maxTTL ?? common_web_1.DAY;
+        this.cache = new Map();
+        this.staleTTL = staleTTL ?? HOUR;
+        this.maxTTL = maxTTL ?? DAY;
     }
     async cacheDid(did, doc) {
         this.cache.set(did, { doc, updatedAt: Date.now() });
@@ -55,5 +35,4 @@ class MemoryCache {
         this.cache.clear();
     }
 }
-exports.MemoryCache = MemoryCache;
 //# sourceMappingURL=memory-cache.js.map

package/dist/did/memory-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-cache.js","sourceRoot":"","sources":["../../src/did/memory-cache.ts"],"names":[],"mappings":";;;AAAA,oDAA+C;AAQ/C,MAAa,WAAW;IAGtB,YAAY,QAAiB,EAAE,MAAe;QAFvC;;;;;WAAgB;QAChB;;;;;WAAc;QAMd;;;;mBAA+B,IAAI,GAAG,EAAE;WAAA;QAJ7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,iBAAI,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,gBAAG,CAAA;IAC7B,CAAC;IAID,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,GAAgB;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,GAAW,EACX,MAAyC;QAEzC,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAA;QAC1B,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,MAAM,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAA;QACjD,MAAM,KAAK,GAAG,GAAG,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAA;QACjD,OAAO;YACL,GAAG,GAAG;YACN,GAAG;YACH,KAAK;YACL,OAAO;SACR,CAAA;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;CACF;AA7CD,kCA6CC","sourcesContent":["import { DAY, HOUR } from '@atproto/common-web'\nimport { CacheResult, DidCache, DidDocument } from '../types'\n\ntype CacheVal = {\n  doc: DidDocument\n  updatedAt: number\n}\n\nexport class MemoryCache implements DidCache {\n  public staleTTL: number\n  public maxTTL: number\n  constructor(staleTTL?: number, maxTTL?: number) {\n    this.staleTTL = staleTTL ?? HOUR\n    this.maxTTL = maxTTL ?? DAY\n  }\n\n  public cache: Map<string, CacheVal> = new Map()\n\n  async cacheDid(did: string, doc: DidDocument): Promise<void> {\n    this.cache.set(did, { doc, updatedAt: Date.now() })\n  }\n\n  async refreshCache(\n    did: string,\n    getDoc: () => Promise<DidDocument | null>,\n  ): Promise<void> {\n    const doc = await getDoc()\n    if (doc) {\n      await this.cacheDid(did, doc)\n    }\n  }\n\n  async checkCache(did: string): Promise<CacheResult | null> {\n    const val = this.cache.get(did)\n    if (!val) return null\n    const now = Date.now()\n    const expired = now > val.updatedAt + this.maxTTL\n    const stale = now > val.updatedAt + this.staleTTL\n    return {\n      ...val,\n      did,\n      stale,\n      expired,\n    }\n  }\n\n  async clearEntry(did: string): Promise<void> {\n    this.cache.delete(did)\n  }\n\n  async clear(): Promise<void> {\n    this.cache.clear()\n  }\n}\n"]}
+{"version":3,"file":"memory-cache.js","sourceRoot":"","sources":["../../src/did/memory-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAQ/C,MAAM,OAAO,WAAW;IAGtB,YAAY,QAAiB,EAAE,MAAe;QAKvC,UAAK,GAA0B,IAAI,GAAG,EAAE,CAAA;QAJ7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,IAAI,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,GAAG,CAAA;IAC7B,CAAC;IAID,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,GAAgB;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,GAAW,EACX,MAAyC;QAEzC,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAA;QAC1B,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,MAAM,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAA;QACjD,MAAM,KAAK,GAAG,GAAG,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAA;QACjD,OAAO;YACL,GAAG,GAAG;YACN,GAAG;YACH,KAAK;YACL,OAAO;SACR,CAAA;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;CACF","sourcesContent":["import { DAY, HOUR } from '@atproto/common-web'\nimport { CacheResult, DidCache, DidDocument } from '../types.js'\n\ntype CacheVal = {\n  doc: DidDocument\n  updatedAt: number\n}\n\nexport class MemoryCache implements DidCache {\n  public staleTTL: number\n  public maxTTL: number\n  constructor(staleTTL?: number, maxTTL?: number) {\n    this.staleTTL = staleTTL ?? HOUR\n    this.maxTTL = maxTTL ?? DAY\n  }\n\n  public cache: Map<string, CacheVal> = new Map()\n\n  async cacheDid(did: string, doc: DidDocument): Promise<void> {\n    this.cache.set(did, { doc, updatedAt: Date.now() })\n  }\n\n  async refreshCache(\n    did: string,\n    getDoc: () => Promise<DidDocument | null>,\n  ): Promise<void> {\n    const doc = await getDoc()\n    if (doc) {\n      await this.cacheDid(did, doc)\n    }\n  }\n\n  async checkCache(did: string): Promise<CacheResult | null> {\n    const val = this.cache.get(did)\n    if (!val) return null\n    const now = Date.now()\n    const expired = now > val.updatedAt + this.maxTTL\n    const stale = now > val.updatedAt + this.staleTTL\n    return {\n      ...val,\n      did,\n      stale,\n      expired,\n    }\n  }\n\n  async clearEntry(did: string): Promise<void> {\n    this.cache.delete(did)\n  }\n\n  async clear(): Promise<void> {\n    this.cache.clear()\n  }\n}\n"]}

package/dist/did/plc-resolver.d.ts

@@ -1,5 +1,5 @@
-import { DidCache } from '../types';
-import { BaseResolver } from './base-resolver';
+import { DidCache } from '../types.js';
+import { BaseResolver } from './base-resolver.js';
 export declare class DidPlcResolver extends BaseResolver {
     plcUrl: string;
     timeout: number;

package/dist/did/plc-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plc-resolver.d.ts","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,cAAe,SAAQ,YAAY;IAErC,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,MAAM;IACf,KAAK,CAAC,EAAE,QAAQ;gBAFhB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,QAAQ,YAAA;IAKnB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBpD"}
+{"version":3,"file":"plc-resolver.d.ts","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,qBAAa,cAAe,SAAQ,YAAY;IAErC,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,MAAM;IACf,KAAK,CAAC,EAAE,QAAQ;gBAFhB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,QAAQ,YAAA;IAKnB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBpD"}

package/dist/did/plc-resolver.js

@@ -1,32 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DidPlcResolver = void 0;
-const base_resolver_1 = require("./base-resolver");
-const util_1 = require("./util");
-class DidPlcResolver extends base_resolver_1.BaseResolver {
+import { BaseResolver } from './base-resolver.js';
+import { timed } from './util.js';
+export class DidPlcResolver extends BaseResolver {
     constructor(plcUrl, timeout, cache) {
         super(cache);
-        Object.defineProperty(this, "plcUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: plcUrl
-        });
-        Object.defineProperty(this, "timeout", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: timeout
-        });
-        Object.defineProperty(this, "cache", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: cache
-        });
+        this.plcUrl = plcUrl;
+        this.timeout = timeout;
+        this.cache = cache;
     }
     async resolveNoCheck(did) {
-        return (0, util_1.timed)(this.timeout, async (signal) => {
+        return timed(this.timeout, async (signal) => {
             const url = new URL(`/${encodeURIComponent(did)}`, this.plcUrl);
             const res = await fetch(url, {
                 redirect: 'error',
@@ -43,5 +25,4 @@ class DidPlcResolver extends base_resolver_1.BaseResolver {
         });
     }
 }
-exports.DidPlcResolver = DidPlcResolver;
 //# sourceMappingURL=plc-resolver.js.map

package/dist/did/plc-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"plc-resolver.js","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":";;;AACA,mDAA8C;AAC9C,iCAA8B;AAE9B,MAAa,cAAe,SAAQ,4BAAY;IAC9C,YACS,MAAc,EACd,OAAe,EACf,KAAgB;QAEvB,KAAK,CAAC,KAAK,CAAC,CAAA;QAJZ;;;;mBAAO,MAAM;WAAQ;QACrB;;;;mBAAO,OAAO;WAAQ;QACtB;;;;mBAAO,KAAK;WAAW;IAGzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,OAAO,IAAA,YAAK,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAC/D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC3B,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,0CAA0C,EAAE;gBAC/D,MAAM;aACP,CAAC,CAAA;YAEF,yDAAyD;YACzD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;gBAAE,OAAO,IAAI,CAAA;YAEnC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;YACxE,CAAC;YAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AA5BD,wCA4BC","sourcesContent":["import { DidCache } from '../types'\nimport { BaseResolver } from './base-resolver'\nimport { timed } from './util'\n\nexport class DidPlcResolver extends BaseResolver {\n  constructor(\n    public plcUrl: string,\n    public timeout: number,\n    public cache?: DidCache,\n  ) {\n    super(cache)\n  }\n\n  async resolveNoCheck(did: string): Promise<unknown> {\n    return timed(this.timeout, async (signal) => {\n      const url = new URL(`/${encodeURIComponent(did)}`, this.plcUrl)\n      const res = await fetch(url, {\n        redirect: 'error',\n        headers: { accept: 'application/did+ld+json,application/json' },\n        signal,\n      })\n\n      // Positively not found, versus due to e.g. network error\n      if (res.status === 404) return null\n\n      if (!res.ok) {\n        throw Object.assign(new Error(res.statusText), { status: res.status })\n      }\n\n      return res.json()\n    })\n  }\n}\n"]}
+{"version":3,"file":"plc-resolver.js","sourceRoot":"","sources":["../../src/did/plc-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAEjC,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC9C,YACS,MAAc,EACd,OAAe,EACf,KAAgB;QAEvB,KAAK,CAAC,KAAK,CAAC,CAAA;QAJL,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,UAAK,GAAL,KAAK,CAAW;IAGzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAC/D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC3B,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,0CAA0C,EAAE;gBAC/D,MAAM;aACP,CAAC,CAAA;YAEF,yDAAyD;YACzD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;gBAAE,OAAO,IAAI,CAAA;YAEnC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;YACxE,CAAC;YAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF","sourcesContent":["import { DidCache } from '../types.js'\nimport { BaseResolver } from './base-resolver.js'\nimport { timed } from './util.js'\n\nexport class DidPlcResolver extends BaseResolver {\n  constructor(\n    public plcUrl: string,\n    public timeout: number,\n    public cache?: DidCache,\n  ) {\n    super(cache)\n  }\n\n  async resolveNoCheck(did: string): Promise<unknown> {\n    return timed(this.timeout, async (signal) => {\n      const url = new URL(`/${encodeURIComponent(did)}`, this.plcUrl)\n      const res = await fetch(url, {\n        redirect: 'error',\n        headers: { accept: 'application/did+ld+json,application/json' },\n        signal,\n      })\n\n      // Positively not found, versus due to e.g. network error\n      if (res.status === 404) return null\n\n      if (!res.ok) {\n        throw Object.assign(new Error(res.statusText), { status: res.status })\n      }\n\n      return res.json()\n    })\n  }\n}\n"]}

package/dist/did/util.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.timed = timed;
-async function timed(ms, fn) {
+export async function timed(ms, fn) {
     const abortController = new AbortController();
     const timer = setTimeout(() => abortController.abort(), ms);
     const signal = abortController.signal;

package/dist/did/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/did/util.ts"],"names":[],"mappings":";;AAAA,sBAcC;AAdM,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,EAAK;IAEL,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAA;IAErC,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAA2B,CAAA;IACrD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,eAAe,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;AACH,CAAC","sourcesContent":["export async function timed<F extends (signal: AbortSignal) => unknown>(\n  ms: number,\n  fn: F,\n): Promise<Awaited<ReturnType<F>>> {\n  const abortController = new AbortController()\n  const timer = setTimeout(() => abortController.abort(), ms)\n  const signal = abortController.signal\n\n  try {\n    return (await fn(signal)) as Awaited<ReturnType<F>>\n  } finally {\n    clearTimeout(timer)\n    abortController.abort()\n  }\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/did/util.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,EAAK;IAEL,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;IAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAA;IAErC,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAA2B,CAAA;IACrD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,eAAe,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;AACH,CAAC","sourcesContent":["export async function timed<F extends (signal: AbortSignal) => unknown>(\n  ms: number,\n  fn: F,\n): Promise<Awaited<ReturnType<F>>> {\n  const abortController = new AbortController()\n  const timer = setTimeout(() => abortController.abort(), ms)\n  const signal = abortController.signal\n\n  try {\n    return (await fn(signal)) as Awaited<ReturnType<F>>\n  } finally {\n    clearTimeout(timer)\n    abortController.abort()\n  }\n}\n"]}