Merge pull request #1632 from HumanCellAtlas/hs-compact-drs-uris

Add support for compact identifier-based DRS URIs in file descriptors

Author: hannes-ucsc

changelog.md

@@ -7,6 +7,10 @@ and (starting with v4.0.0) this project adheres to [Semantic Versioning](http://
 
 ## [Unreleased](https://github.com/HumanCellAtlas/metadata-schema/tree/staging)
 
+### [system/file_descriptor.json - v2.2.0] - 2025-11-04
+### Added
+Added support for compact identifier-based DRS URIs in file descriptors
+
 ### [module/biomaterial/human_specific.json - v1.1.0] - 2025-11-12
 ### Added
 Added optional ethnicity_question

json_schema/system/file_descriptor.json

@@ -98,8 +98,22 @@
     "drs_uri": {
       "description": "Data Repository Service URI pointing at this file. If this property is absent, a data file exists in the repository containing this descriptor. If this property is present and not `null`, a data file exists in another repository at the specified URI. If this property is present but `null`, the data file is not available, but will likely become available in the future, along with an updated descriptor referencing it.",
       "user_friendly": "Data Repository Service URI",
-      "type": ["string", "null"],
-      "format": "uri",
+      "anyOf": [
+        {
+          "type": "null"
+        },
+        {
+          "$comment": "Host-based DRS URI. We use the `uri` format so as to not reinvent the wheel but we need to disallow colons in the authority (what the DRS spec calls hostname) and in the path (what the DRS spec calls ID). The DRS spec explicitly states that the hostname can't have a colon. And if we allowed colons in the ID, `drs://a/b:c` would be ambiguous: it could be a host-based DRS URI with hostname `a` and ID `b:c` or a compact identifier-based DRS URI with prefix `a/b` and accession `c`.",
+          "type": "string",
+          "format": "uri",
+          "pattern": "^drs://[^/:]+/[^:]+$"
+        },
+        {
+          "$comment": "Compact identifier-based DRS URI. We can't use the `uri` format because a colon in the URI authority must be followed by a numeric port number, whereas the DRS spec simply says to use the compact identifier verbatim, without escaping the colon that separates prefix and accession. Accessions arent't necessarily numeric. We can be pretty restrictive about the prefix (optional provider code, followed by slash and namespace) because the spec explicitly lists the allowed characters, but like the ID in host-based DRS URIs, there are no such restrictions for accession.",
+          "type": "string",
+          "pattern": "^drs://([A-Za-z0-9._]+/)?[A-Za-z0-9._]+:.+$"
+        }
+      ],
       "example": "drs://drs.example.org/314159"
     }
   }

json_schema/versions.json

@@ -1,5 +1,5 @@
 {
-    "last_update_date": "2025-11-12T15:35:25Z",
+    "last_update_date": "2025-11-12T19:07:05Z",
     "version_numbers": {
         "core": {
             "biomaterial": {
@@ -89,7 +89,7 @@
             }
         },
         "system": {
-            "file_descriptor": "2.1.0",
+            "file_descriptor": "2.2.0",
             "license": "1.0.0",
             "links": "3.1.0",
             "provenance": "1.1.0"