Fix regex for toBeValidDid/isValidDid to match with ABNF rules in lat…

…est spec.
w3c · May 21, 2021 · 262f6dc · 262f6dc
1 parent 1ddb28c
commit 262f6dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/jest-did-matcher/src/matchers/toBeValidDid/index.test.js b/packages/jest-did-matcher/src/matchers/toBeValidDid/index.test.js
@@ -10,7 +10,8 @@ describe('.toBeValidDid', () => {
     ["did:example:123456789abcdefghi"],
     ["did:example:123456789-abcdefghi"],
     ["did:example:123456789_abcdefghi"],
-    ["did:example:123456789%20abcdefghi"]
+    ["did:example:123456789%20abcdefghi"],
+    ["did:example:123abc:123456789abcdefghi"],
   ]).test('passes when the item is a valid DID: %s', given => {
     expect(given).toBeValidDid();
   });

diff --git a/packages/jest-did-matcher/src/matchers/toBeValidDid/predicate.js b/packages/jest-did-matcher/src/matchers/toBeValidDid/predicate.js
@@ -1,4 +1,4 @@
 export default expected => {
-    const didRegex = /^did:(?<method_name>[a-z0-9]+):(?<method_specific_id>([a-zA-Z0-9.\-_]|%[0-9a-fA-F]{2}|:)+$)/;
+    const didRegex = /^did:(?<method_name>[a-z0-9]+):(?<method_specific_id>([a-zA-Z0-9.\-_]|%[0-9a-fA-F]{2}|:)+[^:]$)/;
     return didRegex.test(expected);
 };