Relaxed the constraints on verification materials

See w3c/did#571 (comment)
jlinclabs · Jan 25, 2021 · 03947e7 · 03947e7
1 parent 5e0287f
commit 03947e7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 20 deletions.
diff --git a/vocabs/DID-core-shape-v1.jsonld b/vocabs/DID-core-shape-v1.jsonld
@@ -31,6 +31,10 @@
             "@id": "http://www.w3.org/ns/shacl#xone",
             "@type": "@id"
         },
+        "not": {
+            "@id": "http://www.w3.org/ns/shacl#not",
+            "@type": "@id"
+        },
         "property": {
             "@id": "http://www.w3.org/ns/shacl#property",
             "@type": "@id"
@@ -149,7 +153,8 @@
             "@id": "_:b2",
             "datatype": "xsd:string",
             "nodeKind": "sh:Literal",
-            "path": "did:publicKeyBase58"
+            "path": "did:publicKeyBase58",
+            "sh:maxCount": 1
         },
         {
             "@id": "_:b20",
@@ -181,18 +186,26 @@
                 "did:keyAgreement",
                 "did:verificationMethod"
             ],
-            "xone": {
-                "@list": [
-                    "_:b20",
-                    "_:b19"
+            "not": {
+                "@type": "sh:NodeShape",
+                "property": [
+                    {
+                        "path": "did:publicKeyBase58",
+                        "sh:minCount" : 1
+                    },
+                    {
+                        "path": "did:publicKeyJwk",
+                        "sh:minCount" : 1
+                    }
                 ]
             }
         },
         {
             "@id": "_:b6",
             "datatype": "rdf:JSON",
             "nodeKind": "sh:Literal",
-            "path": "did:publicKeyJwk"
+            "path": "did:publicKeyJwk",
+            "sh:maxCount": 1
         },
         {
             "@id": "_:b7",

diff --git a/vocabs/DID-core-shape-v1.shex b/vocabs/DID-core-shape-v1.shex
@@ -1,7 +1,7 @@
 # This shape expression is hosted at  https://www.w3.org/ns/did/shex/v1
 #
 # You can run this (using https://www.npmjs.com/package/shex/v/0.5.5), for example, with:
-#  shex -x DID-core-shape.shex -d shape_test.ttl -n did:ex:12345 -s ObjectShape
+#  shex -x DID-core-shape-v1.shex -d shape_test.ttl -n did:ex:12345 -s ObjectShape
 # 
 
 #
@@ -14,7 +14,7 @@ _:ControllerShape IRI /^did:[a-z0-9]+:[a-zA-Z0-9.-_:]+/
 _:VerificationMethodShape IRI {
     did:controller @_:ControllerShape+ ;
     rdf:type IRI+ ;
-    (did:publicKeyJwk rdf:JSON {0,1} | did:publicKeyBase58 LITERAL {0,1} );
+    ( did:publicKeyJwk rdf:JSON {0,1} | did:publicKeyBase58 LITERAL {0,1} ) {0,1};
 }
 
 _:ServiceShape IRI {

diff --git a/vocabs/DID-core-shape-v1.ttl b/vocabs/DID-core-shape-v1.ttl
@@ -76,10 +76,12 @@ _:VerificationMethodShape a sh:NodeShape ;
             sh:path did:publicKeyJwk ;
             sh:nodeKind sh:Literal ;
             sh:datatype rdf:JSON ;
+            sh:maxCount 1;
         ],[
             sh:path did:publicKeyBase58 ;
             sh:nodeKind sh:Literal ;
             sh:datatype xsd:string ;
+            sh:maxCount 1;
         ],[
             sh:path did:controller ;
             # A controller must be identified with a DID...
@@ -90,19 +92,18 @@ _:VerificationMethodShape a sh:NodeShape ;
             sh:path rdf:type ;
             sh:nodeKind sh:IRI ;
             sh:minCount 1 ;
+        ];
+        sh:not [
+            a sh:NodeShape ;
+            sh:property
+                [
+                    sh:path did:publicKeyBase58 ;
+                    sh:minCount 1 ;
+                ],[
+                    sh:path did:publicKeyJwk ;
+                    sh:minCount 1 ;
+                ];
         ] ;
-    sh:xone (
-        [
-            sh:path did:publicKeyBase58 ;
-            sh:minCount 1 ;
-            sh:maxCount 1 ;
-        ]
-        [
-            sh:path did:publicKeyJwk ;
-            sh:minCount 1 ;
-            sh:maxCount 1 ;
-        ]
-    ) ;
 .
 
 #######################################################################################