@atcute/did-plc 0.3.3 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/README.md +2 -1
  2. package/dist/client.js +5 -5
  3. package/dist/client.js.map +1 -1
  4. package/dist/typedefs.d.ts +19 -19
  5. package/dist/typedefs.d.ts.map +1 -1
  6. package/dist/typedefs.js +54 -48
  7. package/dist/typedefs.js.map +1 -1
  8. package/lib/client.ts +5 -5
  9. package/lib/typedefs.ts +73 -59
  10. package/package.json +8 -8
package/README.md CHANGED
@@ -54,13 +54,14 @@ const did = await deriveDidFromGenesisOp(signedGenesisOp);
54
54
 
55
55
  ```ts
56
56
  import { defs, processIndexedEntryLog } from '@atcute/did-plc';
57
+ import * as v from 'valibot';
57
58
 
58
59
  const did = 'did:plc:ragtjsm2j2vknwkz3zp4oxrd';
59
60
 
60
61
  const response = await fetch(`https://plc.directory/${did}/log/audit`);
61
62
  const json = await response.json();
62
63
 
63
- const logs = defs.indexedEntryLog.parse(json);
64
+ const logs = v.parse(defs.indexedEntryLog, json);
64
65
  const { canonical, nullified } = await processIndexedEntryLog(did, logs);
65
66
  ```
66
67
 
package/dist/client.js CHANGED
@@ -44,11 +44,11 @@ const assertResponseOk = async (response) => {
44
44
  }
45
45
  throw await PlcClientError.fromResponse(response);
46
46
  };
47
- const handleDocument = pipe(assertResponseOk, parseResponseAsJson(/^application\/(did\+ld\+)?json$/, MAX_RESPONSE_SIZE), validateJsonWith(identityDefs.didDocument, { mode: 'passthrough' }));
48
- const handlePlcState = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.plcState, { mode: 'passthrough' }));
49
- const handleOperationLog = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.operationLog, { mode: 'passthrough' }));
50
- const handleIndexedEntryLog = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.indexedEntryLog, { mode: 'passthrough' }));
51
- const handleLastOperation = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.compatibleOperationOrTombstone, { mode: 'passthrough' }));
47
+ const handleDocument = pipe(assertResponseOk, parseResponseAsJson(/^application\/(did\+ld\+)?json$/, MAX_RESPONSE_SIZE), validateJsonWith(identityDefs.didDocument));
48
+ const handlePlcState = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.plcState));
49
+ const handleOperationLog = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.operationLog));
50
+ const handleIndexedEntryLog = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.indexedEntryLog));
51
+ const handleLastOperation = pipe(assertResponseOk, parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE), validateJsonWith(defs.compatibleOperationOrTombstone));
52
52
  /**
53
53
  * client for interacting with plc.directory
54
54
  */
package/dist/client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../lib/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../lib/client.ts"],"names":[],"mappings":"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"}
package/dist/typedefs.d.ts CHANGED
@@ -1,21 +1,21 @@
1
- import * as v from '@badrap/valita';
1
+ import * as v from 'valibot';
2
2
  import * as t from './types.ts';
3
- export declare const didPlcString: v.Type<`did:plc:${string}`>;
4
- export declare const permissiveDidKeyString: v.Type<`did:key:${string}`>;
5
- export declare const didKeyString: v.Type<`did:key:${string}`>;
6
- export declare const unsignedLegacyCreateOperation: v.Type<t.UnsignedLegacyCreateOperation>;
7
- export declare const legacyCreateOperation: v.Type<t.LegacyCreateOperation>;
8
- export declare const service: v.Type<t.Service>;
9
- export declare const unsignedOperation: v.Type<t.UnsignedOperation>;
10
- export declare const operation: v.Type<t.Operation>;
11
- export declare const unsignedTombstone: v.Type<t.UnsignedTombstone>;
12
- export declare const tombstone: v.Type<t.Tombstone>;
13
- export declare const compatibleOperation: v.Type<t.CompatibleOperation>;
14
- export declare const compatibleOperationOrTombstone: v.Type<t.CompatibleOperationOrTombstone>;
15
- export declare const operationOrTombstone: v.Type<t.OperationOrTombstone>;
16
- export declare const operationLog: v.Type<t.OperationLog>;
17
- export declare const indexedEntry: v.Type<t.IndexedEntry>;
18
- export declare const indexedEntryLog: v.Type<t.IndexedEntryLog>;
19
- export declare const plcState: v.Type<t.PlcState>;
20
- export declare const sequencedEntry: v.Type<t.SequencedEntry>;
3
+ export declare const didPlcString: v.CustomSchema<`did:plc:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
4
+ export declare const permissiveDidKeyString: v.CustomSchema<`did:key:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
5
+ export declare const didKeyString: v.CustomSchema<`did:key:${string}`, v.ErrorMessage<v.CustomIssue> | undefined>;
6
+ export declare const unsignedLegacyCreateOperation: v.GenericSchema<unknown, t.UnsignedLegacyCreateOperation>;
7
+ export declare const legacyCreateOperation: v.GenericSchema<unknown, t.LegacyCreateOperation>;
8
+ export declare const service: v.GenericSchema<unknown, t.Service>;
9
+ export declare const unsignedOperation: v.GenericSchema<unknown, t.UnsignedOperation>;
10
+ export declare const operation: v.GenericSchema<unknown, t.Operation>;
11
+ export declare const unsignedTombstone: v.GenericSchema<unknown, t.UnsignedTombstone>;
12
+ export declare const tombstone: v.GenericSchema<unknown, t.Tombstone>;
13
+ export declare const compatibleOperation: v.GenericSchema<unknown, t.CompatibleOperation>;
14
+ export declare const compatibleOperationOrTombstone: v.GenericSchema<unknown, t.CompatibleOperationOrTombstone>;
15
+ export declare const operationOrTombstone: v.GenericSchema<unknown, t.OperationOrTombstone>;
16
+ export declare const operationLog: v.GenericSchema<unknown, t.OperationLog>;
17
+ export declare const indexedEntry: v.GenericSchema<unknown, t.IndexedEntry>;
18
+ export declare const indexedEntryLog: v.GenericSchema<unknown, t.IndexedEntryLog>;
19
+ export declare const plcState: v.GenericSchema<unknown, t.PlcState>;
20
+ export declare const sequencedEntry: v.GenericSchema<unknown, t.SequencedEntry>;
21
21
  //# sourceMappingURL=typedefs.d.ts.map
package/dist/typedefs.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"typedefs.d.ts","sourceRoot":"","sources":["../lib/typedefs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAGhC,eAAO,MAAM,YAAY,6BAAmD,CAAC;AAE7E,eAAO,MAAM,sBAAsB,6BAAmD,CAAC;AAEvF,eAAO,MAAM,YAAY,6BAYvB,CAAC;AAuBH,eAAO,MAAM,6BAA6B,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CACnD,CAAC;AAEhC,eAAO,MAAM,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAEhE,CAAC;AAIH,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAGpC,CAAC;AAWH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAsB,CAAC;AAEjF,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAExC,CAAC;AASH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAsB,CAAC;AAEjF,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAExC,CAAC;AAIH,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAA6C,CAAC;AAE5G,eAAO,MAAM,8BAA8B,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAInF,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAiC,CAAC;AAElG,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAET,CAAC;AAYxC,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAiB,CAAC;AAElE,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAEsB,CAAC;AAI7E,eAAO,MAAM,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAMtC,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAGlD,CAAC"}
1
+ {"version":3,"file":"typedefs.d.ts","sourceRoot":"","sources":["../lib/typedefs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAGhC,eAAO,MAAM,YAAY,gFAA0D,CAAC;AAEpF,eAAO,MAAM,sBAAsB,gFAA0D,CAAC;AAE9F,eAAO,MAAM,YAAY,gFAUJ,CAAC;AAyBtB,eAAO,MAAM,6BAA6B,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,6BAA6B,CAChD,CAAC;AAErD,eAAO,MAAM,qBAAqB,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,qBAAqB,CAGlF,CAAC;AAIH,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAGtD,CAAC;AAWH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB,CACpC,CAAC;AAEzC,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAG1D,CAAC;AASH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB,CACpC,CAAC;AAEzC,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAG1D,CAAC;AAIH,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,mBAAmB,CAG9E,CAAC;AAEH,eAAO,MAAM,8BAA8B,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,8BAA8B,CAC/C,CAAC;AAExD,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,oBAAoB,CAGhF,CAAC;AAEH,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAGjE,CAAC;AAeF,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAsC,CAAC;AAEzG,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,eAAe,CAGvE,CAAC;AAIF,eAAO,MAAM,QAAQ,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAMxD,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,cAAc,CAIpE,CAAC"}
package/dist/typedefs.js CHANGED
@@ -1,105 +1,111 @@
1
1
  import * as CID from '@atcute/cid';
2
2
  import { parseDidKey } from '@atcute/crypto';
3
3
  import { isKeyDid, isPlcDid } from '@atcute/identity';
4
- import * as v from '@badrap/valita';
4
+ import * as v from 'valibot';
5
5
  import * as t from './types.js';
6
6
  // #region Strings
7
- export const didPlcString = v.string().assert(isPlcDid, `must be a did:plc`);
8
- export const permissiveDidKeyString = v.string().assert(isKeyDid, `must be a did:key`);
9
- export const didKeyString = v.string().chain((input) => {
7
+ export const didPlcString = v.custom(isPlcDid, `must be a did:plc`);
8
+ export const permissiveDidKeyString = v.custom(isKeyDid, `must be a did:key`);
9
+ export const didKeyString = v.custom((input) => {
10
+ if (!isKeyDid(input)) {
11
+ return false;
12
+ }
10
13
  try {
11
14
  parseDidKey(input);
15
+ return true;
12
16
  }
13
- catch (err) {
14
- if (err instanceof SyntaxError) {
15
- return v.err(`did:key can't be parsed`);
16
- }
17
- return v.err(`invalid did:key`);
17
+ catch {
18
+ return false;
18
19
  }
19
- return v.ok(input);
20
- });
21
- const cidString = v.string().chain((input) => {
20
+ }, `invalid did:key`);
21
+ const cidString = v.pipe(v.string(), v.check((input) => {
22
22
  try {
23
23
  CID.fromString(input);
24
+ return true;
24
25
  }
25
26
  catch {
26
- return v.err(`invalid cid`);
27
+ return false;
27
28
  }
28
- return v.ok(input);
29
- });
29
+ }, `invalid cid`));
30
30
  // #endregion
31
31
  // #region create
32
- const _unsignedLegacyCreateOperation = v.object({
32
+ const unsignedLegacyCreateOperationEntries = {
33
33
  type: v.literal('create'),
34
34
  prev: v.null(),
35
35
  signingKey: didKeyString,
36
36
  recoveryKey: didKeyString,
37
37
  handle: v.string(),
38
38
  service: v.string(),
39
- });
40
- export const unsignedLegacyCreateOperation = _unsignedLegacyCreateOperation;
41
- export const legacyCreateOperation = _unsignedLegacyCreateOperation.extend({
39
+ };
40
+ export const unsignedLegacyCreateOperation = v.looseObject(unsignedLegacyCreateOperationEntries);
41
+ export const legacyCreateOperation = v.looseObject({
42
+ ...unsignedLegacyCreateOperationEntries,
42
43
  sig: v.string(),
43
44
  });
44
45
  // #endregion
45
46
  // #region plc_operation
46
- export const service = v.object({
47
+ export const service = v.looseObject({
47
48
  type: v.string(),
48
49
  endpoint: v.string(),
49
50
  });
50
- const _unsignedOperation = v.object({
51
+ const unsignedOperationEntries = {
51
52
  type: v.literal('plc_operation'),
52
- prev: v.string().nullable(),
53
+ prev: v.nullable(v.string()),
53
54
  rotationKeys: v.array(didKeyString),
54
- verificationMethods: v.record(permissiveDidKeyString),
55
+ verificationMethods: v.record(v.string(), permissiveDidKeyString),
55
56
  alsoKnownAs: v.array(v.string()),
56
- services: v.record(service),
57
- });
58
- export const unsignedOperation = _unsignedOperation;
59
- export const operation = _unsignedOperation.extend({
57
+ services: v.record(v.string(), service),
58
+ };
59
+ export const unsignedOperation = v.looseObject(unsignedOperationEntries);
60
+ export const operation = v.looseObject({
61
+ ...unsignedOperationEntries,
60
62
  sig: v.string(),
61
63
  });
62
64
  // #endregion
63
65
  // #region plc_tombstone
64
- const _unsignedTombstone = v.object({
66
+ const unsignedTombstoneEntries = {
65
67
  type: v.literal('plc_tombstone'),
66
68
  prev: v.string(),
67
- });
68
- export const unsignedTombstone = _unsignedTombstone;
69
- export const tombstone = _unsignedTombstone.extend({
69
+ };
70
+ export const unsignedTombstone = v.looseObject(unsignedTombstoneEntries);
71
+ export const tombstone = v.looseObject({
72
+ ...unsignedTombstoneEntries,
70
73
  sig: v.string(),
71
74
  });
72
75
  // #endregion
73
76
  // #region Entry
74
- export const compatibleOperation = v.union(operation, legacyCreateOperation);
75
- export const compatibleOperationOrTombstone = v.union(operation, legacyCreateOperation, tombstone);
76
- export const operationOrTombstone = v.union(operation, tombstone);
77
- export const operationLog = v
78
- .tuple([compatibleOperation])
79
- .concat(v.array(operationOrTombstone));
77
+ export const compatibleOperation = v.union([
78
+ operation,
79
+ legacyCreateOperation,
80
+ ]);
81
+ export const compatibleOperationOrTombstone = v.union([operation, legacyCreateOperation, tombstone]);
82
+ export const operationOrTombstone = v.union([
83
+ operation,
84
+ tombstone,
85
+ ]);
86
+ export const operationLog = v.tupleWithRest([compatibleOperation], operationOrTombstone);
80
87
  // #endregion
81
88
  // #region Indexed entry
82
- const _indexedEntry = v.object({
89
+ const indexedEntryEntries = {
83
90
  did: didPlcString,
84
91
  operation: compatibleOperationOrTombstone,
85
92
  cid: cidString,
86
93
  nullified: v.boolean(),
87
- createdAt: v.string().assert((input) => !Number.isNaN(new Date(input).getTime()), `invalid timestamp`),
88
- });
89
- export const indexedEntry = _indexedEntry;
90
- export const indexedEntryLog = v
91
- .tuple([_indexedEntry.extend({ operation: compatibleOperation })])
92
- .concat(v.array(_indexedEntry.extend({ operation: operationOrTombstone })));
94
+ createdAt: v.pipe(v.string(), v.check((input) => !Number.isNaN(new Date(input).getTime()), `invalid timestamp`)),
95
+ };
96
+ export const indexedEntry = v.looseObject(indexedEntryEntries);
97
+ export const indexedEntryLog = v.tupleWithRest([v.looseObject({ ...indexedEntryEntries, operation: compatibleOperation })], v.looseObject({ ...indexedEntryEntries, operation: operationOrTombstone }));
93
98
  // #endregion
94
99
  // #region Client response schemas
95
- export const plcState = v.object({
100
+ export const plcState = v.looseObject({
96
101
  did: didPlcString,
97
102
  rotationKeys: v.array(didKeyString),
98
- verificationMethods: v.record(permissiveDidKeyString),
103
+ verificationMethods: v.record(v.string(), permissiveDidKeyString),
99
104
  alsoKnownAs: v.array(v.string()),
100
- services: v.record(service),
105
+ services: v.record(v.string(), service),
101
106
  });
102
- export const sequencedEntry = _indexedEntry.extend({
107
+ export const sequencedEntry = v.looseObject({
108
+ ...indexedEntryEntries,
103
109
  type: v.literal('sequenced_op'),
104
110
  seq: v.number(),
105
111
  });
package/dist/typedefs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"typedefs.js","sourceRoot":"","sources":["../lib/typedefs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typedefs.js","sourceRoot":"","sources":["../lib/typedefs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,CAAC,MAAM,YAAY,CAAC;AAEhC,kBAAkB;AAClB,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAiB,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AAEpF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAiB,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAiB,CAAC,KAAK,EAAE,EAAE;IAC9D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACJ,WAAW,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CACvB,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACjB,IAAI,CAAC;QACJ,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC,EAAE,aAAa,CAAC,CACjB,CAAC;AACF,aAAa;AAEb,iBAAiB;AACjB,MAAM,oCAAoC,GAAG;IAC5C,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;IACd,UAAU,EAAE,YAAY;IACxB,WAAW,EAAE,YAAY;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GACzC,CAAC,CAAC,WAAW,CAAC,oCAAoC,CAAC,CAAC;AAErD,MAAM,CAAC,MAAM,qBAAqB,GAAsD,CAAC,CAAC,WAAW,CAAC;IACrG,GAAG,oCAAoC;IACvC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AACH,aAAa;AAEb,wBAAwB;AACxB,MAAM,CAAC,MAAM,OAAO,GAAwC,CAAC,CAAC,WAAW,CAAC;IACzE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG;IAChC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;IACnC,mBAAmB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC;IACjE,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAC7B,CAAC,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAEzC,MAAM,CAAC,MAAM,SAAS,GAA0C,CAAC,CAAC,WAAW,CAAC;IAC7E,GAAG,wBAAwB;IAC3B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AACH,aAAa;AAEb,wBAAwB;AACxB,MAAM,wBAAwB,GAAG;IAChC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAC7B,CAAC,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;AAEzC,MAAM,CAAC,MAAM,SAAS,GAA0C,CAAC,CAAC,WAAW,CAAC;IAC7E,GAAG,wBAAwB;IAC3B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AACH,aAAa;AAEb,gBAAgB;AAChB,MAAM,CAAC,MAAM,mBAAmB,GAAoD,CAAC,CAAC,KAAK,CAAC;IAC3F,SAAS;IACT,qBAAqB;CACrB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,8BAA8B,GAC1C,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,qBAAqB,EAAE,SAAS,CAAC,CAAC,CAAC;AAExD,MAAM,CAAC,MAAM,oBAAoB,GAAqD,CAAC,CAAC,KAAK,CAAC;IAC7F,SAAS;IACT,SAAS;CACT,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAA6C,CAAC,CAAC,aAAa,CACpF,CAAC,mBAAmB,CAAC,EACrB,oBAAoB,CACpB,CAAC;AACF,aAAa;AAEb,wBAAwB;AACxB,MAAM,mBAAmB,GAAG;IAC3B,GAAG,EAAE,YAAY;IACjB,SAAS,EAAE,8BAA8B;IACzC,GAAG,EAAE,SAAS;IACd,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,IAAI,CAChB,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,mBAAmB,CAAC,CACjF;CACD,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAA6C,CAAC,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;AAEzG,MAAM,CAAC,MAAM,eAAe,GAAgD,CAAC,CAAC,aAAa,CAC1F,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,mBAAmB,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAAC,EAC3E,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,mBAAmB,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC,CAC1E,CAAC;AACF,aAAa;AAEb,kCAAkC;AAClC,MAAM,CAAC,MAAM,QAAQ,GAAyC,CAAC,CAAC,WAAW,CAAC;IAC3E,GAAG,EAAE,YAAY;IACjB,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;IACnC,mBAAmB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC;IACjE,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC;CACvC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAA+C,CAAC,CAAC,WAAW,CAAC;IACvF,GAAG,mBAAmB;IACtB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;IAC/B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AACH,aAAa"}
package/lib/client.ts CHANGED
@@ -62,31 +62,31 @@ const assertResponseOk = async (response: Response): Promise<Response> => {
62
62
  const handleDocument = pipe(
63
63
  assertResponseOk,
64
64
  parseResponseAsJson(/^application\/(did\+ld\+)?json$/, MAX_RESPONSE_SIZE),
65
- validateJsonWith(identityDefs.didDocument, { mode: 'passthrough' }),
65
+ validateJsonWith(identityDefs.didDocument),
66
66
  );
67
67
 
68
68
  const handlePlcState = pipe(
69
69
  assertResponseOk,
70
70
  parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE),
71
- validateJsonWith(defs.plcState, { mode: 'passthrough' }),
71
+ validateJsonWith(defs.plcState),
72
72
  );
73
73
 
74
74
  const handleOperationLog = pipe(
75
75
  assertResponseOk,
76
76
  parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE),
77
- validateJsonWith(defs.operationLog, { mode: 'passthrough' }),
77
+ validateJsonWith(defs.operationLog),
78
78
  );
79
79
 
80
80
  const handleIndexedEntryLog = pipe(
81
81
  assertResponseOk,
82
82
  parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE),
83
- validateJsonWith(defs.indexedEntryLog, { mode: 'passthrough' }),
83
+ validateJsonWith(defs.indexedEntryLog),
84
84
  );
85
85
 
86
86
  const handleLastOperation = pipe(
87
87
  assertResponseOk,
88
88
  parseResponseAsJson(/^application\/json$/, MAX_RESPONSE_SIZE),
89
- validateJsonWith(defs.compatibleOperationOrTombstone, { mode: 'passthrough' }),
89
+ validateJsonWith(defs.compatibleOperationOrTombstone),
90
90
  );
91
91
 
92
92
  export interface PlcClientOptions {
package/lib/typedefs.ts CHANGED
@@ -2,135 +2,149 @@ import * as CID from '@atcute/cid';
2
2
  import { parseDidKey } from '@atcute/crypto';
3
3
  import { isKeyDid, isPlcDid } from '@atcute/identity';
4
4
 
5
- import * as v from '@badrap/valita';
5
+ import * as v from 'valibot';
6
6
 
7
7
  import * as t from './types.ts';
8
8
 
9
9
  // #region Strings
10
- export const didPlcString = v.string().assert(isPlcDid, `must be a did:plc`);
10
+ export const didPlcString = v.custom<t.DidPlcString>(isPlcDid, `must be a did:plc`);
11
11
 
12
- export const permissiveDidKeyString = v.string().assert(isKeyDid, `must be a did:key`);
12
+ export const permissiveDidKeyString = v.custom<t.DidKeyString>(isKeyDid, `must be a did:key`);
13
13
 
14
- export const didKeyString = v.string().chain((input) => {
15
- try {
16
- parseDidKey(input);
17
- } catch (err) {
18
- if (err instanceof SyntaxError) {
19
- return v.err(`did:key can't be parsed`);
20
- }
21
-
22
- return v.err(`invalid did:key`);
14
+ export const didKeyString = v.custom<t.DidKeyString>((input) => {
15
+ if (!isKeyDid(input)) {
16
+ return false;
23
17
  }
24
-
25
- return v.ok(input as t.DidKeyString);
26
- });
27
-
28
- const cidString = v.string().chain((input) => {
29
18
  try {
30
- CID.fromString(input);
19
+ parseDidKey(input);
20
+ return true;
31
21
  } catch {
32
- return v.err(`invalid cid`);
22
+ return false;
33
23
  }
34
-
35
- return v.ok(input);
36
- });
24
+ }, `invalid did:key`);
25
+
26
+ const cidString = v.pipe(
27
+ v.string(),
28
+ v.check((input) => {
29
+ try {
30
+ CID.fromString(input);
31
+ return true;
32
+ } catch {
33
+ return false;
34
+ }
35
+ }, `invalid cid`),
36
+ );
37
37
  // #endregion
38
38
 
39
39
  // #region create
40
- const _unsignedLegacyCreateOperation = v.object({
40
+ const unsignedLegacyCreateOperationEntries = {
41
41
  type: v.literal('create'),
42
42
  prev: v.null(),
43
43
  signingKey: didKeyString,
44
44
  recoveryKey: didKeyString,
45
45
  handle: v.string(),
46
46
  service: v.string(),
47
- }) satisfies v.Type<t.UnsignedLegacyCreateOperation>;
47
+ };
48
48
 
49
- export const unsignedLegacyCreateOperation: v.Type<t.UnsignedLegacyCreateOperation> =
50
- _unsignedLegacyCreateOperation;
49
+ export const unsignedLegacyCreateOperation: v.GenericSchema<unknown, t.UnsignedLegacyCreateOperation> =
50
+ v.looseObject(unsignedLegacyCreateOperationEntries);
51
51
 
52
- export const legacyCreateOperation: v.Type<t.LegacyCreateOperation> = _unsignedLegacyCreateOperation.extend({
52
+ export const legacyCreateOperation: v.GenericSchema<unknown, t.LegacyCreateOperation> = v.looseObject({
53
+ ...unsignedLegacyCreateOperationEntries,
53
54
  sig: v.string(),
54
55
  });
55
56
  // #endregion
56
57
 
57
58
  // #region plc_operation
58
- export const service: v.Type<t.Service> = v.object({
59
+ export const service: v.GenericSchema<unknown, t.Service> = v.looseObject({
59
60
  type: v.string(),
60
61
  endpoint: v.string(),
61
62
  });
62
63
 
63
- const _unsignedOperation = v.object({
64
+ const unsignedOperationEntries = {
64
65
  type: v.literal('plc_operation'),
65
- prev: v.string().nullable(),
66
+ prev: v.nullable(v.string()),
66
67
  rotationKeys: v.array(didKeyString),
67
- verificationMethods: v.record(permissiveDidKeyString),
68
+ verificationMethods: v.record(v.string(), permissiveDidKeyString),
68
69
  alsoKnownAs: v.array(v.string()),
69
- services: v.record(service),
70
- }) satisfies v.Type<t.UnsignedOperation>;
70
+ services: v.record(v.string(), service),
71
+ };
71
72
 
72
- export const unsignedOperation: v.Type<t.UnsignedOperation> = _unsignedOperation;
73
+ export const unsignedOperation: v.GenericSchema<unknown, t.UnsignedOperation> =
74
+ v.looseObject(unsignedOperationEntries);
73
75
 
74
- export const operation: v.Type<t.Operation> = _unsignedOperation.extend({
76
+ export const operation: v.GenericSchema<unknown, t.Operation> = v.looseObject({
77
+ ...unsignedOperationEntries,
75
78
  sig: v.string(),
76
79
  });
77
80
  // #endregion
78
81
 
79
82
  // #region plc_tombstone
80
- const _unsignedTombstone = v.object({
83
+ const unsignedTombstoneEntries = {
81
84
  type: v.literal('plc_tombstone'),
82
85
  prev: v.string(),
83
- }) satisfies v.Type<t.UnsignedTombstone>;
86
+ };
84
87
 
85
- export const unsignedTombstone: v.Type<t.UnsignedTombstone> = _unsignedTombstone;
88
+ export const unsignedTombstone: v.GenericSchema<unknown, t.UnsignedTombstone> =
89
+ v.looseObject(unsignedTombstoneEntries);
86
90
 
87
- export const tombstone: v.Type<t.Tombstone> = _unsignedTombstone.extend({
91
+ export const tombstone: v.GenericSchema<unknown, t.Tombstone> = v.looseObject({
92
+ ...unsignedTombstoneEntries,
88
93
  sig: v.string(),
89
94
  });
90
95
  // #endregion
91
96
 
92
97
  // #region Entry
93
- export const compatibleOperation: v.Type<t.CompatibleOperation> = v.union(operation, legacyCreateOperation);
94
-
95
- export const compatibleOperationOrTombstone: v.Type<t.CompatibleOperationOrTombstone> = v.union(
98
+ export const compatibleOperation: v.GenericSchema<unknown, t.CompatibleOperation> = v.union([
96
99
  operation,
97
100
  legacyCreateOperation,
98
- tombstone,
99
- );
101
+ ]);
100
102
 
101
- export const operationOrTombstone: v.Type<t.OperationOrTombstone> = v.union(operation, tombstone);
103
+ export const compatibleOperationOrTombstone: v.GenericSchema<unknown, t.CompatibleOperationOrTombstone> =
104
+ v.union([operation, legacyCreateOperation, tombstone]);
102
105
 
103
- export const operationLog: v.Type<t.OperationLog> = v
104
- .tuple([compatibleOperation])
105
- .concat(v.array(operationOrTombstone));
106
+ export const operationOrTombstone: v.GenericSchema<unknown, t.OperationOrTombstone> = v.union([
107
+ operation,
108
+ tombstone,
109
+ ]);
110
+
111
+ export const operationLog: v.GenericSchema<unknown, t.OperationLog> = v.tupleWithRest(
112
+ [compatibleOperation],
113
+ operationOrTombstone,
114
+ );
106
115
  // #endregion
107
116
 
108
117
  // #region Indexed entry
109
- const _indexedEntry = v.object({
118
+ const indexedEntryEntries = {
110
119
  did: didPlcString,
111
120
  operation: compatibleOperationOrTombstone,
112
121
  cid: cidString,
113
122
  nullified: v.boolean(),
114
- createdAt: v.string().assert((input) => !Number.isNaN(new Date(input).getTime()), `invalid timestamp`),
115
- }) satisfies v.Type<t.IndexedEntry>;
123
+ createdAt: v.pipe(
124
+ v.string(),
125
+ v.check((input) => !Number.isNaN(new Date(input).getTime()), `invalid timestamp`),
126
+ ),
127
+ };
116
128
 
117
- export const indexedEntry: v.Type<t.IndexedEntry> = _indexedEntry;
129
+ export const indexedEntry: v.GenericSchema<unknown, t.IndexedEntry> = v.looseObject(indexedEntryEntries);
118
130
 
119
- export const indexedEntryLog: v.Type<t.IndexedEntryLog> = v
120
- .tuple([_indexedEntry.extend({ operation: compatibleOperation })])
121
- .concat(v.array(_indexedEntry.extend({ operation: operationOrTombstone })));
131
+ export const indexedEntryLog: v.GenericSchema<unknown, t.IndexedEntryLog> = v.tupleWithRest(
132
+ [v.looseObject({ ...indexedEntryEntries, operation: compatibleOperation })],
133
+ v.looseObject({ ...indexedEntryEntries, operation: operationOrTombstone }),
134
+ );
122
135
  // #endregion
123
136
 
124
137
  // #region Client response schemas
125
- export const plcState: v.Type<t.PlcState> = v.object({
138
+ export const plcState: v.GenericSchema<unknown, t.PlcState> = v.looseObject({
126
139
  did: didPlcString,
127
140
  rotationKeys: v.array(didKeyString),
128
- verificationMethods: v.record(permissiveDidKeyString),
141
+ verificationMethods: v.record(v.string(), permissiveDidKeyString),
129
142
  alsoKnownAs: v.array(v.string()),
130
- services: v.record(service),
143
+ services: v.record(v.string(), service),
131
144
  });
132
145
 
133
- export const sequencedEntry: v.Type<t.SequencedEntry> = _indexedEntry.extend({
146
+ export const sequencedEntry: v.GenericSchema<unknown, t.SequencedEntry> = v.looseObject({
147
+ ...indexedEntryEntries,
134
148
  type: v.literal('sequenced_op'),
135
149
  seq: v.number(),
136
150
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atcute/did-plc",
3
- "version": "0.3.3",
3
+ "version": "1.0.0",
4
4
  "description": "validations, type definitions and schemas for did:plc operations",
5
5
  "keywords": [
6
6
  "atproto",
@@ -28,15 +28,15 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@badrap/valita": "^0.4.6",
31
+ "valibot": "^1.4.0",
32
32
  "@atcute/cbor": "^2.3.3",
33
33
  "@atcute/crypto": "^2.4.1",
34
34
  "@atcute/cid": "^2.4.1",
35
- "@atcute/identity": "^1.1.5",
36
- "@atcute/lexicons": "^1.3.1",
35
+ "@atcute/identity": "^2.0.0",
37
36
  "@atcute/uint8array": "^1.1.1",
38
- "@atcute/util-fetch": "^1.0.5",
39
- "@atcute/multibase": "^1.2.0"
37
+ "@atcute/lexicons": "^2.0.0",
38
+ "@atcute/multibase": "^1.2.0",
39
+ "@atcute/util-fetch": "^2.0.0"
40
40
  },
41
41
  "devDependencies": {
42
42
  "@vitest/coverage-v8": "^4.1.5",
@@ -46,8 +46,8 @@
46
46
  "peerDependencies": {
47
47
  "@atcute/cbor": "^2.0.0",
48
48
  "@atcute/cid": "^2.0.0",
49
- "@atcute/identity": "^1.0.0",
50
- "@atcute/lexicons": "^1.0.0"
49
+ "@atcute/identity": "^2.0.0",
50
+ "@atcute/lexicons": "^2.0.0"
51
51
  },
52
52
  "scripts": {
53
53
  "build": "tsgo",