@atcute/identity 1.1.4 → 2.0.0

package/README.md

@@ -154,14 +154,15 @@ use the validation schemas to check if a DID document is well-formed:
 
 ```ts
 import { defs } from '@atcute/identity';
+import * as v from 'valibot';
 
-const result = defs.didDocument.try(unknownData);
-if (result.ok) {
-	// result.value is a validated DidDocument
-	console.log(result.value.id);
+const result = v.safeParse(defs.didDocument, unknownData);
+if (result.success) {
+	// result.output is a validated DidDocument
+	console.log(result.output.id);
 } else {
 	// validation failed
-	console.error('invalid DID document');
+	console.error('invalid DID document', result.issues);
 }
 ```
 

package/dist/did.d.ts

@@ -1,10 +1,11 @@
+import type { AtprotoAudience, AtprotoDid, Did } from '@atcute/lexicons/syntax';
 /**
  * checks if it's a DID identifier that is supported by atproto
  */
-export declare const isAtprotoDid: (input: string) => input is `did:plc:${string}` | `did:web:${string}`;
-export declare const isAtprotoAudience: (input: string) => input is `did:plc:${string}#${string}` | `did:web:${string}#${string}`;
+export declare const isAtprotoDid: (input: unknown) => input is AtprotoDid;
+export declare const isAtprotoAudience: (input: unknown) => input is AtprotoAudience;
 /**
  * returns the DID's method
  */
-export declare const extractDidMethod: <M extends string>(did: `did:${M}:${string}`) => M;
+export declare const extractDidMethod: <M extends string>(did: Did<M>) => M;
 //# sourceMappingURL=did.d.ts.map

package/dist/did.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"did.d.ts","sourceRoot":"","sources":["../lib/did.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,YAAY,uEAExB,CAAC;AAEF,eAAO,MAAM,iBAAiB,2FAY7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,gDAIjC,CAAC"}
+{"version":3,"file":"did.d.ts","sourceRoot":"","sources":["../lib/did.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAOhF;;GAEG;AACH,eAAO,MAAM,YAAY,UAAW,OAAO,KAAG,KAAK,IAAI,UAEtD,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,OAAO,KAAG,KAAK,IAAI,eAY3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,KAAG,CAIhE,CAAC"}

package/dist/did.js

@@ -9,7 +9,7 @@ export const isAtprotoDid = (input) => {
 };
 export const isAtprotoAudience = (input) => {
     // 'did:web:a.co#f'
-    if (input.length < 14) {
+    if (typeof input !== 'string' || input.length < 14) {
         return false;
     }
     const isep = input.indexOf('#', 12);

package/dist/did.js.map

@@ -1 +1 @@
-{"version":3,"file":"did.js","sourceRoot":"","sources":["../lib/did.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,GAAG,wDAAwD,CAAC;AAE7E;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAuB,EAAE;IAClE,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAA4B,EAAE;IAC5E,mBAAmB;IACnB,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACpC,IAAI,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACtF,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAmB,GAAW,EAAK,EAAE;IACpE,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAClC,OAAO,MAAW,CAAC;AACpB,CAAC,CAAC"}
+{"version":3,"file":"did.js","sourceRoot":"","sources":["../lib/did.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,WAAW,GAAG,wDAAwD,CAAC;AAE7E;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAc,EAAuB,EAAE;IACnE,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAA4B,EAAE;IAC7E,mBAAmB;IACnB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACpC,IAAI,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACtF,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAmB,GAAW,EAAK,EAAE;IACpE,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAClC,OAAO,MAAW,CAAC;AACpB,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * as defs from './typedefs.ts';
-export * from './types.ts';
+export type { DidDocument, Service, VerificationMethod } from './typedefs.ts';
 export * from './utils.ts';
 export * from './did.ts';
 export * from './methods/key.ts';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,cAAc,YAAY,CAAC;AAE3B,cAAc,YAAY,CAAC;AAE3B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE9E,cAAc,YAAY,CAAC;AAE3B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}

package/dist/index.js

@@ -1,5 +1,4 @@
 export * as defs from './typedefs.js';
-export * from './types.js';
 export * from './utils.js';
 export * from './did.js';
 export * from './methods/key.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,cAAc,YAAY,CAAC;AAE3B,cAAc,YAAY,CAAC;AAE3B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAGtC,cAAc,YAAY,CAAC;AAE3B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}

package/dist/methods/key.d.ts

@@ -1,5 +1,6 @@
+import type { Did } from '@atcute/lexicons';
 /**
  * checks if input is a did:key identifier
  */
-export declare const isKeyDid: (input: string) => input is `did:key:${string}`;
+export declare const isKeyDid: (input: unknown) => input is Did<'key'>;
 //# sourceMappingURL=key.d.ts.map

package/dist/methods/key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../lib/methods/key.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,eAAO,MAAM,QAAQ,iDAEpB,CAAC"}
+{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../lib/methods/key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAI5C;;GAEG;AACH,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,GAAG,CAAC,KAAK,CAE3D,CAAC"}

package/dist/methods/key.js

@@ -3,6 +3,6 @@ const KEY_DID_RE = /^did:key:z[a-km-zA-HJ-NP-Z1-9]+$/;
  * checks if input is a did:key identifier
  */
 export const isKeyDid = (input) => {
-    return input.length >= 10 && KEY_DID_RE.test(input);
+    return typeof input === 'string' && input.length >= 10 && KEY_DID_RE.test(input);
 };
 //# sourceMappingURL=key.js.map

package/dist/methods/key.js.map

@@ -1 +1 @@
-{"version":3,"file":"key.js","sourceRoot":"","sources":["../../lib/methods/key.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,kCAAkC,CAAC;AAEtD;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAuB,EAAE;IAC9D,OAAO,KAAK,CAAC,MAAM,IAAI,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC,CAAC"}
+{"version":3,"file":"key.js","sourceRoot":"","sources":["../../lib/methods/key.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,kCAAkC,CAAC;AAEtD;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAuB,EAAE;IAC/D,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAClF,CAAC,CAAC"}

package/dist/methods/plc.d.ts

@@ -1,7 +1,6 @@
-/** @deprecated use `isPlcDid` instead */
-export declare const PLC_DID_RE: RegExp;
+import type { Did } from '@atcute/lexicons/syntax';
 /**
  * checks if input is a did:plc identifier
  */
-export declare const isPlcDid: (input: string) => input is `did:plc:${string}`;
+export declare const isPlcDid: (input: unknown) => input is Did<'plc'>;
 //# sourceMappingURL=plc.d.ts.map

package/dist/methods/plc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plc.d.ts","sourceRoot":"","sources":["../../lib/methods/plc.ts"],"names":[],"mappings":"AAEA,yCAAyC;AACzC,eAAO,MAAM,UAAU,QAA6B,CAAC;AAErD;;GAEG;AACH,eAAO,MAAM,QAAQ,iDAEpB,CAAC"}
+{"version":3,"file":"plc.d.ts","sourceRoot":"","sources":["../../lib/methods/plc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAInD;;GAEG;AACH,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,GAAG,CAAC,KAAK,CAE3D,CAAC"}

package/dist/methods/plc.js

@@ -1,9 +1,8 @@
-/** @deprecated use `isPlcDid` instead */
-export const PLC_DID_RE = /^did:plc:([a-z2-7]{24})$/;
+const PLC_DID_RE = /^did:plc:([a-z2-7]{24})$/;
 /**
  * checks if input is a did:plc identifier
  */
 export const isPlcDid = (input) => {
-    return input.length === 32 && PLC_DID_RE.test(input);
+    return typeof input === 'string' && input.length === 32 && PLC_DID_RE.test(input);
 };
 //# sourceMappingURL=plc.js.map

package/dist/methods/plc.js.map

@@ -1 +1 @@
-{"version":3,"file":"plc.js","sourceRoot":"","sources":["../../lib/methods/plc.ts"],"names":[],"mappings":"AAEA,yCAAyC;AACzC,MAAM,CAAC,MAAM,UAAU,GAAG,0BAA0B,CAAC;AAErD;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAuB,EAAE;IAC9D,OAAO,KAAK,CAAC,MAAM,KAAK,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC,CAAC"}
+{"version":3,"file":"plc.js","sourceRoot":"","sources":["../../lib/methods/plc.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,0BAA0B,CAAC;AAE9C;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAuB,EAAE;IAC/D,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACnF,CAAC,CAAC"}

package/dist/methods/web.d.ts

@@ -1,23 +1,20 @@
-/** @deprecated use `isWebDid` instead */
-export declare const WEB_DID_RE: RegExp;
-/** @deprecated use `isAtprotoWebDid` instead */
-export declare const ATPROTO_WEB_DID_RE: RegExp;
+import type { Did } from '@atcute/lexicons/syntax';
 /**
  * checks if input is a did:web identifier, note that you should probably use
  * `isAtprotoWebDid` for atproto-related cases as atproto only supports a subset
  * of the did:web specification (namely, no custom paths)
  */
-export declare const isWebDid: (input: string) => input is `did:web:${string}`;
+export declare const isWebDid: (input: unknown) => input is Did<'web'>;
 /**
  * checks if input is a did:web identifier that is supported by atproto
  */
-export declare const isAtprotoWebDid: (input: string) => input is `did:web:${string}`;
+export declare const isAtprotoWebDid: (input: unknown) => input is Did<'web'>;
 /**
  * normalize a did:web identifier
  */
-export declare const normalizeWebDid: (did: `did:web:${string}`) => `did:web:${string}`;
+export declare const normalizeWebDid: (did: Did<'web'>) => Did<'web'>;
 /**
  * converts did:web identifier into the DID document's URL
  */
-export declare const webDidToDocumentUrl: (did: `did:web:${string}`) => URL;
+export declare const webDidToDocumentUrl: (did: Did<'web'>) => URL;
 //# sourceMappingURL=web.d.ts.map

package/dist/methods/web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../lib/methods/web.ts"],"names":[],"mappings":"AAEA,yCAAyC;AACzC,eAAO,MAAM,UAAU,QAC4E,CAAC;AAEpG,gDAAgD;AAChD,eAAO,MAAM,kBAAkB,QAC2D,CAAC;AAE3F;;;;GAIG;AACH,eAAO,MAAM,QAAQ,iDAEpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,iDAE3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,mDAS3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,mCAgB/B,CAAC"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../lib/methods/web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAQnD;;;;GAIG;AACH,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,GAAG,CAAC,KAAK,CAE3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,UAAW,OAAO,KAAG,KAAK,IAAI,GAAG,CAAC,KAAK,CAElE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,QAAS,GAAG,CAAC,KAAK,CAAC,KAAG,GAAG,CAAC,KAAK,CAS1D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAS,GAAG,CAAC,KAAK,CAAC,KAAG,GAgBrD,CAAC"}

package/dist/methods/web.js

@@ -1,20 +1,18 @@
-/** @deprecated use `isWebDid` instead */
-export const WEB_DID_RE = /^did:web:([a-zA-Z0-9%-]+(?:(?:\.[a-zA-Z0-9%-]+)*(?:\.[a-zA-Z]{2,}))?)?((?::[a-zA-Z0-9\-%.]+)+)?$/;
-/** @deprecated use `isAtprotoWebDid` instead */
-export const ATPROTO_WEB_DID_RE = /^did:web:([a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*(?:\.[a-zA-Z]{2,})|localhost(?:%3[aA]\d+)?)$/;
+const WEB_DID_RE = /^did:web:([a-zA-Z0-9%-]+(?:(?:\.[a-zA-Z0-9%-]+)*(?:\.[a-zA-Z]{2,}))?)?((?::[a-zA-Z0-9\-%.]+)+)?$/;
+const ATPROTO_WEB_DID_RE = /^did:web:([a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*(?:\.[a-zA-Z]{2,})|localhost(?:%3[aA]\d+)?)$/;
 /**
  * checks if input is a did:web identifier, note that you should probably use
  * `isAtprotoWebDid` for atproto-related cases as atproto only supports a subset
  * of the did:web specification (namely, no custom paths)
  */
 export const isWebDid = (input) => {
-    return input.length >= 9 && WEB_DID_RE.test(input);
+    return typeof input === 'string' && input.length >= 9 && WEB_DID_RE.test(input);
 };
 /**
  * checks if input is a did:web identifier that is supported by atproto
  */
 export const isAtprotoWebDid = (input) => {
-    return input.length >= 12 && ATPROTO_WEB_DID_RE.test(input);
+    return typeof input === 'string' && input.length >= 12 && ATPROTO_WEB_DID_RE.test(input);
 };
 /**
  * normalize a did:web identifier

package/dist/methods/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../lib/methods/web.ts"],"names":[],"mappings":"AAEA,yCAAyC;AACzC,MAAM,CAAC,MAAM,UAAU,GACtB,kGAAkG,CAAC;AAEpG,gDAAgD;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAC9B,yFAAyF,CAAC;AAE3F;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAuB,EAAE;IAC9D,OAAO,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAa,EAAuB,EAAE;IACrE,OAAO,KAAK,CAAC,MAAM,IAAI,EAAE,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAe,EAAc,EAAE;IAC9D,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEzE,IAAI,UAAU,GAAG,WAAW,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;IACrE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,UAAU,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACrC,CAAC;IAED,OAAO,UAAwB,CAAC;AACjC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAe,EAAO,EAAE;IAC3D,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEzE,IAAI,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACtB,QAAQ,GAAG,uBAAuB,CAAC;IACpC,CAAC;SAAM,CAAC;QACP,QAAQ,IAAI,WAAW,CAAC;IACzB,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,QAAQ,EAAE,CAAC,CAAC;IAClD,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QAClC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../lib/methods/web.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GACf,kGAAkG,CAAC;AAEpG,MAAM,kBAAkB,GACvB,yFAAyF,CAAC;AAE3F;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAuB,EAAE;IAC/D,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjF,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAuB,EAAE;IACtE,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC1F,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAe,EAAc,EAAE;IAC9D,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEzE,IAAI,UAAU,GAAG,WAAW,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;IACrE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,UAAU,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACrC,CAAC;IAED,OAAO,UAAwB,CAAC;AACjC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAe,EAAO,EAAE;IAC3D,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEzE,IAAI,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACtB,QAAQ,GAAG,uBAAuB,CAAC;IACpC,CAAC;SAAM,CAAC;QACP,QAAQ,IAAI,WAAW,CAAC;IACzB,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,QAAQ,EAAE,CAAC,CAAC;IAClD,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QAClC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC"}

package/dist/typedefs.d.ts

@@ -1,14 +1,186 @@
-import * as v from '@badrap/valita';
-import * as t from './types.ts';
-/** @deprecated */
-export declare const FRAGMENT_RE: RegExp;
-/** @deprecated */
-export declare const MULTIBASE_RE: RegExp;
-export declare const rfc3968UriSchema: v.Type<string>;
-export declare const didRelativeUri: v.Type<string>;
-export declare const multibaseString: v.Type<string>;
-export declare const didString: v.Type<`did:${string}:${string}`>;
-export declare const verificationMethod: v.Type<t.VerificationMethod>;
-export declare const service: v.Type<t.Service>;
-export declare const didDocument: v.Type<t.DidDocument>;
+import * as v from 'valibot';
+export declare const rfc3968UriSchema: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>;
+export declare const didRelativeUri: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>;
+export declare const multibaseString: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.RegexAction<string, "must be a base58 multibase">]>;
+export declare const didString: v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
+export declare const verificationMethod: v.SchemaWithPipe<readonly [v.LooseObjectSchema<{
+    readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>;
+    readonly type: v.StringSchema<undefined>;
+    readonly controller: v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
+    readonly publicKeyMultibase: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.RegexAction<string, "must be a base58 multibase">]>, undefined>;
+    readonly publicKeyJwk: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+}, undefined>, v.BaseValidation<{
+    id: string;
+    type: string;
+    controller: `did:${string}:${string}`;
+    publicKeyMultibase?: string | undefined;
+    publicKeyJwk?: {
+        [x: string]: unknown;
+    } | undefined;
+} & {
+    [key: string]: unknown;
+}, {
+    id: string;
+    type: string;
+    controller: `did:${string}:${string}`;
+    publicKeyMultibase?: string | undefined;
+    publicKeyJwk?: {
+        [x: string]: unknown;
+    } | undefined;
+} & {
+    [key: string]: unknown;
+}, v.CheckIssue<{
+    id: string;
+    type: string;
+    controller: `did:${string}:${string}`;
+    publicKeyMultibase?: string | undefined;
+    publicKeyJwk?: {
+        [x: string]: unknown;
+    } | undefined;
+} & {
+    [key: string]: unknown;
+}>>]>;
+export declare const service: v.LooseObjectSchema<{
+    readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>;
+    readonly type: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
+    readonly serviceEndpoint: v.UnionSchema<[v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, v.RecordSchema<v.StringSchema<undefined>, v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, undefined>, v.ArraySchema<v.UnionSchema<[v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, v.RecordSchema<v.StringSchema<undefined>, v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, undefined>], undefined>, undefined>], undefined>;
+}, undefined>;
+export declare const didDocument: v.SchemaWithPipe<readonly [v.LooseObjectSchema<{
+    readonly '@context': v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, undefined>, undefined>;
+    readonly id: v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
+    readonly alsoKnownAs: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, undefined>, v.CheckAction<string[], "duplicate aka entries">]>, undefined>;
+    readonly verificationMethod: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.LooseObjectSchema<{
+        readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>;
+        readonly type: v.StringSchema<undefined>;
+        readonly controller: v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
+        readonly publicKeyMultibase: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.RegexAction<string, "must be a base58 multibase">]>, undefined>;
+        readonly publicKeyJwk: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+    }, undefined>, v.BaseValidation<{
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }, {
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }, v.CheckIssue<{
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }>>]>, undefined>, v.CheckAction<({
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    })[], "duplicate verification method ids">]>, undefined>;
+    readonly service: v.OptionalSchema<v.ArraySchema<v.LooseObjectSchema<{
+        readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>;
+        readonly type: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
+        readonly serviceEndpoint: v.UnionSchema<[v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, v.RecordSchema<v.StringSchema<undefined>, v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, undefined>, v.ArraySchema<v.UnionSchema<[v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, v.RecordSchema<v.StringSchema<undefined>, v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a url">]>, undefined>], undefined>, undefined>], undefined>;
+    }, undefined>, undefined>, undefined>;
+    readonly controller: v.OptionalSchema<v.UnionSchema<[v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>, v.ArraySchema<v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>, undefined>], undefined>, undefined>;
+    readonly authentication: v.OptionalSchema<v.ArraySchema<v.UnionSchema<[v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>, v.SchemaWithPipe<readonly [v.LooseObjectSchema<{
+        readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "must be a did relative uri">]>;
+        readonly type: v.StringSchema<undefined>;
+        readonly controller: v.CustomSchema<`did:${string}:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
+        readonly publicKeyMultibase: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.RegexAction<string, "must be a base58 multibase">]>, undefined>;
+        readonly publicKeyJwk: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+    }, undefined>, v.BaseValidation<{
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }, {
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }, v.CheckIssue<{
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }>>]>], undefined>, undefined>, undefined>;
+}, undefined>, v.CheckAction<{
+    '@context'?: string[] | undefined;
+    id: `did:${string}:${string}`;
+    alsoKnownAs?: string[] | undefined;
+    verificationMethod?: ({
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    })[] | undefined;
+    service?: ({
+        id: string;
+        type: string | string[];
+        serviceEndpoint: string | (string | {
+            [x: string]: string;
+        })[] | {
+            [x: string]: string;
+        };
+    } & {
+        [key: string]: unknown;
+    })[] | undefined;
+    controller?: `did:${string}:${string}`[] | `did:${string}:${string}` | undefined;
+    authentication?: (string | ({
+        id: string;
+        type: string;
+        controller: `did:${string}:${string}`;
+        publicKeyMultibase?: string | undefined;
+        publicKeyJwk?: {
+            [x: string]: unknown;
+        } | undefined;
+    } & {
+        [key: string]: unknown;
+    }))[] | undefined;
+} & {
+    [key: string]: unknown;
+}, "duplicate service ids">]>;
+export type VerificationMethod = v.InferOutput<typeof verificationMethod>;
+export type Service = v.InferOutput<typeof service>;
+export type DidDocument = v.InferOutput<typeof didDocument>;
 //# sourceMappingURL=typedefs.d.ts.map

package/dist/typedefs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typedefs.d.ts","sourceRoot":"","sources":["../lib/typedefs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAEhC,kBAAkB;AAClB,eAAO,MAAM,WAAW,QAAa,CAAC;AACtC,kBAAkB;AAClB,eAAO,MAAM,YAAY,QAA6B,CAAC;AAEvD,eAAO,MAAM,gBAAgB,gBAEV,CAAC;AAEpB,eAAO,MAAM,cAAc,gBAEK,CAAC;AAEjC,eAAO,MAAM,eAAe,gBAEI,CAAC;AAEjC,eAAO,MAAM,SAAS,mCAA4C,CAAC;AAEnE,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CA4BzD,CAAC;AAEJ,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CASpC,CAAC;AAEH,eAAO,MAAM,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAqF3C,CAAC"}
+{"version":3,"file":"typedefs.d.ts","sourceRoot":"","sources":["../lib/typedefs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAK7B,eAAO,MAAM,gBAAgB,gGAG5B,CAAC;AAEF,eAAO,MAAM,cAAc,6GAG1B,CAAC;AAEF,eAAO,MAAM,eAAe,6GAA0E,CAAC;AAEvG,eAAO,MAAM,SAAS,sFAAwC,CAAC;AAE/D,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAoB9B,CAAC;AAEF,eAAO,MAAM,OAAO;;;;aASlB,CAAC;AAcH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAgCvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC1E,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/typedefs.js

@@ -1,121 +1,62 @@
 import { isDid } from '@atcute/lexicons/syntax';
-import * as v from '@badrap/valita';
-import * as t from './types.js';
-/** @deprecated */
-export const FRAGMENT_RE = /^#[^#]+$/;
-/** @deprecated */
-export const MULTIBASE_RE = /^z[a-km-zA-HJ-NP-Z1-9]+$/;
-export const rfc3968UriSchema = v.string().assert((input) => {
-    return URL.canParse(input);
-}, `must be a url`);
-export const didRelativeUri = v.string().assert((input) => {
-    return FRAGMENT_RE.test(input) || URL.canParse(input);
-}, `must be a did relative uri`);
-export const multibaseString = v.string().assert((input) => {
-    return MULTIBASE_RE.test(input);
-}, `must be a base58 multibase`);
-export const didString = v.string().assert(isDid, `must be a did`);
-export const verificationMethod = v
-    .object({
+import * as v from 'valibot';
+const FRAGMENT_RE = /^#[^#]+$/;
+const MULTIBASE_RE = /^z[a-km-zA-HJ-NP-Z1-9]+$/;
+export const rfc3968UriSchema = v.pipe(v.string(), v.check((input) => URL.canParse(input), `must be a url`));
+export const didRelativeUri = v.pipe(v.string(), v.check((input) => FRAGMENT_RE.test(input) || URL.canParse(input), `must be a did relative uri`));
+export const multibaseString = v.pipe(v.string(), v.regex(MULTIBASE_RE, `must be a base58 multibase`));
+export const didString = v.custom(isDid, `must be a did`);
+export const verificationMethod = v.pipe(v.looseObject({
     id: didRelativeUri,
     type: v.string(),
     controller: didString,
-    publicKeyMultibase: multibaseString.optional(),
-    publicKeyJwk: v.record().optional(),
-})
-    .chain((input) => {
+    publicKeyMultibase: v.optional(multibaseString),
+    publicKeyJwk: v.optional(v.record(v.string(), v.unknown())),
+}), v.forward(v.check((input) => {
     switch (input.type) {
-        case 'Multikey': {
-            if (input.publicKeyMultibase === undefined) {
-                return v.err({ message: `missing multikey`, path: ['publicKeyMultibase'] });
-            }
-            break;
-        }
+        case 'Multikey':
         case 'EcdsaSecp256k1VerificationKey2019':
-        case 'EcdsaSecp256r1VerificationKey2019': {
-            if (input.publicKeyMultibase === undefined) {
-                return v.err({ message: `missing multibase key`, path: ['publicKeyMultibase'] });
-            }
-            break;
-        }
+        case 'EcdsaSecp256r1VerificationKey2019':
+            return input.publicKeyMultibase !== undefined;
     }
-    return v.ok(input);
-});
-export const service = v.object({
+    return true;
+}, `missing public key multibase`), ['publicKeyMultibase']));
+export const service = v.looseObject({
     // should've only been RFC3968, but did:plc uses relative URIs.
     id: didRelativeUri,
-    type: v.union(v.string(), v.array(v.string())),
-    serviceEndpoint: v.union(rfc3968UriSchema, v.record(rfc3968UriSchema), v.array(v.union(rfc3968UriSchema, v.record(rfc3968UriSchema)))),
+    type: v.union([v.string(), v.array(v.string())]),
+    serviceEndpoint: v.union([
+        rfc3968UriSchema,
+        v.record(v.string(), rfc3968UriSchema),
+        v.array(v.union([rfc3968UriSchema, v.record(v.string(), rfc3968UriSchema)])),
+    ]),
 });
-export const didDocument = v
-    .object({
-    '@context': v.array(rfc3968UriSchema).optional(),
-    id: didString,
-    alsoKnownAs: v
-        .array(rfc3968UriSchema)
-        .chain((input) => {
-        for (let i = 0, len = input.length; i < len; i++) {
-            const aka = input[i];
-            for (let j = 0; j < i; j++) {
-                if (aka === input[j]) {
-                    return v.err({
-                        message: `duplicate "${aka}" aka entry`,
-                        path: [i],
-                    });
-                }
-            }
-        }
-        return v.ok(input);
-    })
-        .optional(),
-    verificationMethod: v
-        .array(verificationMethod)
-        .chain((input) => {
-        for (let i = 0, len = input.length; i < len; i++) {
-            const method = input[i];
-            const methodId = method.id;
-            for (let j = 0; j < i; j++) {
-                if (methodId === input[j].id) {
-                    return v.err({
-                        message: `duplicate "${methodId}" verification method`,
-                        path: [i, 'id'],
-                    });
-                }
-            }
-        }
-        return v.ok(input);
-    })
-        .optional(),
-    service: v.array(service).optional(),
-    controller: v.union(didString, v.array(didString)).optional(),
-    authentication: v.array(v.union(didRelativeUri, verificationMethod)).optional(),
-})
-    .chain((input) => {
-    const { id: did, service: services } = input;
-    if (services?.length) {
-        const len = services.length;
-        // oxlint-disable-next-line no-new-array
-        const identifiers = new Array(len);
-        for (let i = 0; i < len; i++) {
-            const service = services[i];
-            let id = service.id;
-            if (id[0] === '#') {
-                id = did + id;
-            }
-            identifiers[i] = id;
-        }
-        for (let i = 0; i < len; i++) {
-            const id = identifiers[i];
-            for (let j = 0; j < i; j++) {
-                if (id === identifiers[j]) {
-                    return v.err({
-                        message: `duplicate "${id}" service`,
-                        path: ['service', i, 'id'],
-                    });
-                }
-            }
+const hasDuplicates = (arr, key = (x) => x) => {
+    const seen = new Set();
+    for (const item of arr) {
+        const k = key(item);
+        if (seen.has(k)) {
+            return true;
         }
+        seen.add(k);
     }
-    return v.ok(input);
-});
+    return false;
+};
+export const didDocument = v.pipe(v.looseObject({
+    '@context': v.optional(v.array(rfc3968UriSchema)),
+    id: didString,
+    alsoKnownAs: v.optional(v.pipe(v.array(rfc3968UriSchema), v.check((input) => !hasDuplicates(input), `duplicate aka entries`))),
+    verificationMethod: v.optional(v.pipe(v.array(verificationMethod), v.check((input) => !hasDuplicates(input, (m) => m.id), `duplicate verification method ids`))),
+    service: v.optional(v.array(service)),
+    controller: v.optional(v.union([didString, v.array(didString)])),
+    authentication: v.optional(v.array(v.union([didRelativeUri, verificationMethod]))),
+}), v.check((input) => {
+    const services = input.service;
+    if (!services?.length) {
+        return true;
+    }
+    const did = input.id;
+    const identifiers = services.map((s) => (s.id[0] === '#' ? did + s.id : s.id));
+    return !hasDuplicates(identifiers);
+}, `duplicate service ids`));
 //# sourceMappingURL=typedefs.js.map

package/dist/typedefs.js.map

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

package/dist/utils.d.ts

@@ -1,4 +1,5 @@
-import * as t from './types.ts';
+import type { Handle } from '@atcute/lexicons';
+import type * as t from './typedefs.ts';
 export interface VerificationMaterial {
     type: string;
     publicKeyMultibase: string;
@@ -7,10 +8,10 @@ export declare const isAtprotoServiceEndpoint: (input: string) => boolean;
 export declare const getVerificationMaterial: (doc: t.DidDocument, id: `#${string}`) => VerificationMaterial | undefined;
 export declare const getAtprotoVerificationMaterial: (doc: t.DidDocument) => VerificationMaterial | undefined;
 export declare const getAtprotoLabelerVerificationMaterial: (doc: t.DidDocument) => VerificationMaterial | undefined;
-export declare const getAtprotoHandle: (doc: t.DidDocument) => `${string}.${string}` | null | undefined;
+export declare const getAtprotoHandle: (doc: t.DidDocument) => Handle | null | undefined;
 export declare const getAtprotoServiceEndpoint: (doc: t.DidDocument, predicate: {
     id: `#${string}`;
-    type?: string | undefined;
+    type?: string;
 }) => string | undefined;
 export declare const getPdsEndpoint: (doc: t.DidDocument) => string | undefined;
 export declare const getLabelerEndpoint: (doc: t.DidDocument) => string | undefined;

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../lib/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAEhC,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;CAC3B;AAID,eAAO,MAAM,wBAAwB,4BAiBpC,CAAC;AAEF,eAAO,MAAM,uBAAuB,4EAwBnC,CAAC;AAEF,eAAO,MAAM,8BAA8B,0DAE1C,CAAC;AAEF,eAAO,MAAM,qCAAqC,0DAIjD,CAAC;AAEF,eAAO,MAAM,gBAAgB,kEAyB5B,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;wBAkCrC,CAAC;AAEF,eAAO,MAAM,cAAc,4CAK1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,4CAK9B,CAAC;AAEF,eAAO,MAAM,sBAAsB,4CAKlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,4CAKrC,CAAC;AAEF,eAAO,MAAM,8BAA8B,4CAK1C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,KAAK,CAAC,MAAM,eAAe,CAAC;AAExC,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;CAC3B;AAID,eAAO,MAAM,wBAAwB,UAAW,MAAM,KAAG,OAiBxD,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAC9B,CAAC,CAAC,WAAW,MACd,IAAI,MAAM,EAAE,KACd,oBAAoB,GAAG,SAqBzB,CAAC;AAEF,eAAO,MAAM,8BAA8B,QAAS,CAAC,CAAC,WAAW,KAAG,oBAAoB,GAAG,SAE1F,CAAC;AAEF,eAAO,MAAM,qCAAqC,QAC5C,CAAC,CAAC,WAAW,KAChB,oBAAoB,GAAG,SAEzB,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,CAAC,CAAC,WAAW,KAAG,MAAM,GAAG,IAAI,GAAG,SAyBrE,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAChC,CAAC,CAAC,WAAW,aACP;IAAE,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAC5C,MAAM,GAAG,SA+BX,CAAC;AAEF,eAAO,MAAM,cAAc,QAAS,CAAC,CAAC,WAAW,KAAG,MAAM,GAAG,SAK5D,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAS,CAAC,CAAC,WAAW,KAAG,MAAM,GAAG,SAKhE,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAS,CAAC,CAAC,WAAW,KAAG,MAAM,GAAG,SAKpE,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAS,CAAC,CAAC,WAAW,KAAG,MAAM,GAAG,SAKvE,CAAC;AAEF,eAAO,MAAM,8BAA8B,QAAS,CAAC,CAAC,WAAW,KAAG,MAAM,GAAG,SAK5E,CAAC"}

package/dist/utils.js

@@ -1,5 +1,4 @@
 import { isHandle } from '@atcute/lexicons/syntax';
-import * as t from './types.js';
 const isUrlParseSupported = 'parse' in URL;
 export const isAtprotoServiceEndpoint = (input) => {
     let url = null;

package/dist/utils.js.map

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

package/lib/did.ts

@@ -8,13 +8,13 @@ const FRAGMENT_RE = /^(?:[A-Za-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*$/;
 /**
  * checks if it's a DID identifier that is supported by atproto
  */
-export const isAtprotoDid = (input: string): input is AtprotoDid => {
+export const isAtprotoDid = (input: unknown): input is AtprotoDid => {
 	return isPlcDid(input) || isAtprotoWebDid(input);
 };
 
-export const isAtprotoAudience = (input: string): input is AtprotoAudience => {
+export const isAtprotoAudience = (input: unknown): input is AtprotoAudience => {
 	// 'did:web:a.co#f'
-	if (input.length < 14) {
+	if (typeof input !== 'string' || input.length < 14) {
 		return false;
 	}
 

package/lib/index.ts

@@ -1,5 +1,5 @@
 export * as defs from './typedefs.ts';
-export * from './types.ts';
+export type { DidDocument, Service, VerificationMethod } from './typedefs.ts';
 
 export * from './utils.ts';
 

package/lib/methods/key.ts

@@ -5,6 +5,6 @@ const KEY_DID_RE = /^did:key:z[a-km-zA-HJ-NP-Z1-9]+$/;
 /**
  * checks if input is a did:key identifier
  */
-export const isKeyDid = (input: string): input is Did<'key'> => {
-	return input.length >= 10 && KEY_DID_RE.test(input);
+export const isKeyDid = (input: unknown): input is Did<'key'> => {
+	return typeof input === 'string' && input.length >= 10 && KEY_DID_RE.test(input);
 };

package/lib/methods/plc.ts

@@ -1,11 +1,10 @@
 import type { Did } from '@atcute/lexicons/syntax';
 
-/** @deprecated use `isPlcDid` instead */
-export const PLC_DID_RE = /^did:plc:([a-z2-7]{24})$/;
+const PLC_DID_RE = /^did:plc:([a-z2-7]{24})$/;
 
 /**
  * checks if input is a did:plc identifier
  */
-export const isPlcDid = (input: string): input is Did<'plc'> => {
-	return input.length === 32 && PLC_DID_RE.test(input);
+export const isPlcDid = (input: unknown): input is Did<'plc'> => {
+	return typeof input === 'string' && input.length === 32 && PLC_DID_RE.test(input);
 };

package/lib/methods/web.ts

@@ -1,11 +1,9 @@
 import type { Did } from '@atcute/lexicons/syntax';
 
-/** @deprecated use `isWebDid` instead */
-export const WEB_DID_RE =
+const WEB_DID_RE =
 	/^did:web:([a-zA-Z0-9%-]+(?:(?:\.[a-zA-Z0-9%-]+)*(?:\.[a-zA-Z]{2,}))?)?((?::[a-zA-Z0-9\-%.]+)+)?$/;
 
-/** @deprecated use `isAtprotoWebDid` instead */
-export const ATPROTO_WEB_DID_RE =
+const ATPROTO_WEB_DID_RE =
 	/^did:web:([a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*(?:\.[a-zA-Z]{2,})|localhost(?:%3[aA]\d+)?)$/;
 
 /**
@@ -13,15 +11,15 @@ export const ATPROTO_WEB_DID_RE =
  * `isAtprotoWebDid` for atproto-related cases as atproto only supports a subset
  * of the did:web specification (namely, no custom paths)
  */
-export const isWebDid = (input: string): input is Did<'web'> => {
-	return input.length >= 9 && WEB_DID_RE.test(input);
+export const isWebDid = (input: unknown): input is Did<'web'> => {
+	return typeof input === 'string' && input.length >= 9 && WEB_DID_RE.test(input);
 };
 
 /**
  * checks if input is a did:web identifier that is supported by atproto
  */
-export const isAtprotoWebDid = (input: string): input is Did<'web'> => {
-	return input.length >= 12 && ATPROTO_WEB_DID_RE.test(input);
+export const isAtprotoWebDid = (input: unknown): input is Did<'web'> => {
+	return typeof input === 'string' && input.length >= 12 && ATPROTO_WEB_DID_RE.test(input);
 };
 
 /**

package/lib/typedefs.ts

@@ -1,152 +1,103 @@
-import { isDid } from '@atcute/lexicons/syntax';
+import { isDid, type Did } from '@atcute/lexicons/syntax';
 
-import * as v from '@badrap/valita';
+import * as v from 'valibot';
 
-import * as t from './types.ts';
+const FRAGMENT_RE = /^#[^#]+$/;
+const MULTIBASE_RE = /^z[a-km-zA-HJ-NP-Z1-9]+$/;
 
-/** @deprecated */
-export const FRAGMENT_RE = /^#[^#]+$/;
-/** @deprecated */
-export const MULTIBASE_RE = /^z[a-km-zA-HJ-NP-Z1-9]+$/;
+export const rfc3968UriSchema = v.pipe(
+	v.string(),
+	v.check((input) => URL.canParse(input), `must be a url`),
+);
 
-export const rfc3968UriSchema = v.string().assert((input) => {
-	return URL.canParse(input);
-}, `must be a url`);
+export const didRelativeUri = v.pipe(
+	v.string(),
+	v.check((input) => FRAGMENT_RE.test(input) || URL.canParse(input), `must be a did relative uri`),
+);
 
-export const didRelativeUri = v.string().assert((input) => {
-	return FRAGMENT_RE.test(input) || URL.canParse(input);
-}, `must be a did relative uri`);
+export const multibaseString = v.pipe(v.string(), v.regex(MULTIBASE_RE, `must be a base58 multibase`));
 
-export const multibaseString = v.string().assert((input) => {
-	return MULTIBASE_RE.test(input);
-}, `must be a base58 multibase`);
+export const didString = v.custom<Did>(isDid, `must be a did`);
 
-export const didString = v.string().assert(isDid, `must be a did`);
-
-export const verificationMethod: v.Type<t.VerificationMethod> = v
-	.object({
+export const verificationMethod = v.pipe(
+	v.looseObject({
 		id: didRelativeUri,
 		type: v.string(),
 		controller: didString,
-		publicKeyMultibase: multibaseString.optional(),
-		publicKeyJwk: v.record().optional(),
-	})
-	.chain((input) => {
-		switch (input.type) {
-			case 'Multikey': {
-				if (input.publicKeyMultibase === undefined) {
-					return v.err({ message: `missing multikey`, path: ['publicKeyMultibase'] });
-				}
-
-				break;
-			}
-			case 'EcdsaSecp256k1VerificationKey2019':
-			case 'EcdsaSecp256r1VerificationKey2019': {
-				if (input.publicKeyMultibase === undefined) {
-					return v.err({ message: `missing multibase key`, path: ['publicKeyMultibase'] });
-				}
-
-				break;
+		publicKeyMultibase: v.optional(multibaseString),
+		publicKeyJwk: v.optional(v.record(v.string(), v.unknown())),
+	}),
+	v.forward(
+		v.check((input) => {
+			switch (input.type) {
+				case 'Multikey':
+				case 'EcdsaSecp256k1VerificationKey2019':
+				case 'EcdsaSecp256r1VerificationKey2019':
+					return input.publicKeyMultibase !== undefined;
 			}
-		}
-
-		return v.ok(input);
-	});
+			return true;
+		}, `missing public key multibase`),
+		['publicKeyMultibase'],
+	),
+);
 
-export const service: v.Type<t.Service> = v.object({
+export const service = v.looseObject({
 	// should've only been RFC3968, but did:plc uses relative URIs.
 	id: didRelativeUri,
-	type: v.union(v.string(), v.array(v.string())),
-	serviceEndpoint: v.union(
+	type: v.union([v.string(), v.array(v.string())]),
+	serviceEndpoint: v.union([
 		rfc3968UriSchema,
-		v.record(rfc3968UriSchema),
-		v.array(v.union(rfc3968UriSchema, v.record(rfc3968UriSchema))),
-	),
+		v.record(v.string(), rfc3968UriSchema),
+		v.array(v.union([rfc3968UriSchema, v.record(v.string(), rfc3968UriSchema)])),
+	]),
 });
 
-export const didDocument: v.Type<t.DidDocument> = v
-	.object({
-		'@context': v.array(rfc3968UriSchema).optional(),
-
-		id: didString,
-
-		alsoKnownAs: v
-			.array(rfc3968UriSchema)
-			.chain((input) => {
-				for (let i = 0, len = input.length; i < len; i++) {
-					const aka = input[i];
-
-					for (let j = 0; j < i; j++) {
-						if (aka === input[j]) {
-							return v.err({
-								message: `duplicate "${aka}" aka entry`,
-								path: [i],
-							});
-						}
-					}
-				}
-
-				return v.ok(input);
-			})
-			.optional(),
-		verificationMethod: v
-			.array(verificationMethod)
-			.chain((input) => {
-				for (let i = 0, len = input.length; i < len; i++) {
-					const method = input[i];
-					const methodId = method.id;
-
-					for (let j = 0; j < i; j++) {
-						if (methodId === input[j].id) {
-							return v.err({
-								message: `duplicate "${methodId}" verification method`,
-								path: [i, 'id'],
-							});
-						}
-					}
-				}
-
-				return v.ok(input);
-			})
-			.optional(),
-		service: v.array(service).optional(),
-
-		controller: v.union(didString, v.array(didString)).optional(),
-		authentication: v.array(v.union(didRelativeUri, verificationMethod)).optional(),
-	})
-	.chain((input) => {
-		const { id: did, service: services } = input;
-
-		if (services?.length) {
-			const len = services.length;
-
-			// oxlint-disable-next-line no-new-array
-			const identifiers = new Array(len);
-
-			for (let i = 0; i < len; i++) {
-				const service = services[i];
-
-				let id = service.id;
-				if (id[0] === '#') {
-					id = did + id;
-				}
+const hasDuplicates = <T>(arr: readonly T[], key: (item: T) => unknown = (x) => x): boolean => {
+	const seen = new Set<unknown>();
+	for (const item of arr) {
+		const k = key(item);
+		if (seen.has(k)) {
+			return true;
+		}
+		seen.add(k);
+	}
+	return false;
+};
 
-				identifiers[i] = id;
-			}
+export const didDocument = v.pipe(
+	v.looseObject({
+		'@context': v.optional(v.array(rfc3968UriSchema)),
 
-			for (let i = 0; i < len; i++) {
-				const id = identifiers[i];
+		id: didString,
 
-				for (let j = 0; j < i; j++) {
-					if (id === identifiers[j]) {
-						return v.err({
-							message: `duplicate "${id}" service`,
-							path: ['service', i, 'id'],
-						});
-					}
-				}
-			}
+		alsoKnownAs: v.optional(
+			v.pipe(
+				v.array(rfc3968UriSchema),
+				v.check((input) => !hasDuplicates(input), `duplicate aka entries`),
+			),
+		),
+		verificationMethod: v.optional(
+			v.pipe(
+				v.array(verificationMethod),
+				v.check((input) => !hasDuplicates(input, (m) => m.id), `duplicate verification method ids`),
+			),
+		),
+		service: v.optional(v.array(service)),
+
+		controller: v.optional(v.union([didString, v.array(didString)])),
+		authentication: v.optional(v.array(v.union([didRelativeUri, verificationMethod]))),
+	}),
+	v.check((input) => {
+		const services = input.service;
+		if (!services?.length) {
+			return true;
 		}
-
-		return v.ok(input);
-	});
+		const did = input.id;
+		const identifiers = services.map((s) => (s.id[0] === '#' ? did + s.id : s.id));
+		return !hasDuplicates(identifiers);
+	}, `duplicate service ids`),
+);
+
+export type VerificationMethod = v.InferOutput<typeof verificationMethod>;
+export type Service = v.InferOutput<typeof service>;
+export type DidDocument = v.InferOutput<typeof didDocument>;

package/lib/utils.ts

@@ -1,7 +1,7 @@
 import type { Handle } from '@atcute/lexicons';
 import { isHandle } from '@atcute/lexicons/syntax';
 
-import * as t from './types.ts';
+import type * as t from './typedefs.ts';
 
 export interface VerificationMaterial {
 	type: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atcute/identity",
-  "version": "1.1.4",
+  "version": "2.0.0",
   "description": "syntax, type definitions and schemas for atproto handles, DIDs and DID documents",
   "keywords": [
     "atproto",
@@ -15,7 +15,8 @@
     "dist/",
     "lib/",
     "!lib/**/*.bench.ts",
-    "!lib/**/*.test.ts"
+    "!lib/**/*.test.ts",
+    "!dist/**/*.{test,bench}.*"
   ],
   "type": "module",
   "sideEffects": false,
@@ -26,15 +27,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@badrap/valita": "^0.4.6",
-    "@atcute/lexicons": "^1.2.9"
+    "valibot": "^1.4.0",
+    "@atcute/lexicons": "^2.0.0"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^4.1.0",
-    "vitest": "^4.1.0"
+    "@vitest/coverage-v8": "^4.1.5",
+    "vitest": "^4.1.5"
+  },
+  "peerDependencies": {
+    "@atcute/lexicons": "^2.0.0"
   },
   "scripts": {
-    "build": "tsgo --project tsconfig.build.json",
+    "build": "tsgo",
     "test": "vitest",
     "prepublish": "rm -rf dist; pnpm run build"
   }

package/dist/types.d.ts

@@ -1,23 +0,0 @@
-import type { Did } from '@atcute/lexicons';
-export interface VerificationMethod {
-    id: string;
-    type: string;
-    controller: Did;
-    publicKeyMultibase?: string;
-    publicKeyJwk?: Record<string, unknown>;
-}
-export interface Service {
-    id: string;
-    type: string | string[];
-    serviceEndpoint: string | Record<string, string> | (string | Record<string, string>)[];
-}
-export interface DidDocument {
-    '@context'?: string[];
-    id: Did;
-    controller?: Did | Did[];
-    alsoKnownAs?: string[];
-    verificationMethod?: VerificationMethod[];
-    authentication?: (string | VerificationMethod)[];
-    service?: Service[];
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,OAAO;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;CACvF;AAED,MAAM,WAAW,WAAW;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,EAAE,EAAE,GAAG,CAAC;IACR,UAAU,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC1C,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,kBAAkB,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACpB"}

package/dist/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../lib/types.ts"],"names":[],"mappings":""}

package/lib/types.ts

@@ -1,25 +0,0 @@
-import type { Did } from '@atcute/lexicons';
-
-export interface VerificationMethod {
-	id: string;
-	type: string;
-	controller: Did;
-	publicKeyMultibase?: string;
-	publicKeyJwk?: Record<string, unknown>;
-}
-
-export interface Service {
-	id: string;
-	type: string | string[];
-	serviceEndpoint: string | Record<string, string> | (string | Record<string, string>)[];
-}
-
-export interface DidDocument {
-	'@context'?: string[];
-	id: Did;
-	controller?: Did | Did[];
-	alsoKnownAs?: string[];
-	verificationMethod?: VerificationMethod[];
-	authentication?: (string | VerificationMethod)[];
-	service?: Service[];
-}