From 8c80dfe0041f968d6c43274bcab0f454ce8ff17f Mon Sep 17 00:00:00 2001
From: Oscar Esteban <code@oscaresteban.es>
Date: Wed, 24 Jan 2024 11:41:28 +0100
Subject: [PATCH 1/3] fix: add pattern to allow `/dir-<label>_dwi.json` files

---
 bids-validator/bids_validator/rules/top_level_rules.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bids-validator/bids_validator/rules/top_level_rules.json b/bids-validator/bids_validator/rules/top_level_rules.json
index ea28ca47f..3c4a913a1 100644
--- a/bids-validator/bids_validator/rules/top_level_rules.json
+++ b/bids-validator/bids_validator/rules/top_level_rules.json
@@ -140,7 +140,7 @@
   },
 
   "dwi_top": {
-    "regexp": "^[\\/\\\\](?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?(dwi\\.(?:@@@_dwi_top_ext_@@@)|sbref\\.json)$",
+    "regexp": "^[\\/\\\\](?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:_dir-[a-zA-Z0-9]+)?(?:run-[0-9]+_)?(dwi\\.(?:@@@_dwi_top_ext_@@@)|sbref\\.json)$",
     "tokens": {
       "@@@_dwi_top_ext_@@@": ["json", "bval", "bvec"]
     }

From 67643b44279e5d0c9b25fdd42e6a0c3198f17f8d Mon Sep 17 00:00:00 2001
From: Oscar Esteban <code@oscaresteban.es>
Date: Wed, 24 Jan 2024 12:05:59 +0100
Subject: [PATCH 2/3] fix: write underscore at the end of regex group

---
 bids-validator/bids_validator/rules/top_level_rules.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bids-validator/bids_validator/rules/top_level_rules.json b/bids-validator/bids_validator/rules/top_level_rules.json
index 3c4a913a1..5b334ccef 100644
--- a/bids-validator/bids_validator/rules/top_level_rules.json
+++ b/bids-validator/bids_validator/rules/top_level_rules.json
@@ -140,7 +140,7 @@
   },
 
   "dwi_top": {
-    "regexp": "^[\\/\\\\](?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:_dir-[a-zA-Z0-9]+)?(?:run-[0-9]+_)?(dwi\\.(?:@@@_dwi_top_ext_@@@)|sbref\\.json)$",
+    "regexp": "^[\\/\\\\](?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:dir-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?(dwi\\.(?:@@@_dwi_top_ext_@@@)|sbref\\.json)$",
     "tokens": {
       "@@@_dwi_top_ext_@@@": ["json", "bval", "bvec"]
     }

From 95c1ca5acb3a9c354e1bbb6d5c9b41b212f464b9 Mon Sep 17 00:00:00 2001
From: Oscar Esteban <code@oscaresteban.es>
Date: Wed, 24 Jan 2024 15:50:19 +0100
Subject: [PATCH 3/3] Update
 bids-validator/bids_validator/rules/top_level_rules.json

Co-authored-by: Chris Markiewicz <effigies@gmail.com>
---
 bids-validator/bids_validator/rules/top_level_rules.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bids-validator/bids_validator/rules/top_level_rules.json b/bids-validator/bids_validator/rules/top_level_rules.json
index 5b334ccef..cf74d715b 100644
--- a/bids-validator/bids_validator/rules/top_level_rules.json
+++ b/bids-validator/bids_validator/rules/top_level_rules.json
@@ -140,7 +140,7 @@
   },
 
   "dwi_top": {
-    "regexp": "^[\\/\\\\](?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:dir-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?(dwi\\.(?:@@@_dwi_top_ext_@@@)|sbref\\.json)$",
+    "regexp": "^[\\/\\\\](?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:dir-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?(?:part-(mag|phase|real|imag)_)?(?:chunk-[0-9]+_)?(dwi\\.(?:@@@_dwi_top_ext_@@@)|sbref\\.json)$",
     "tokens": {
       "@@@_dwi_top_ext_@@@": ["json", "bval", "bvec"]
     }