Merge pull request #354 from jbwexler/recognize-top-level-jsons

update type.js regex to recognize top-level jsons

Author: chrisgorgo

tests/type.spec.js

@@ -98,7 +98,10 @@ var suiteTop = describe('utils.type.isTopLevel', function(){
             "/dataset_description.json",
             "/ses-pre_task-rest_bold.json",
             "/dwi.bval",
-            "/dwi.bvec"
+            "/dwi.bvec",
+            "/T1w.json",
+            "/acq-test_dwi.json",
+            "/rec-test_physio.json"
         ];
 
         goodFilenames.forEach(function (path) {
@@ -112,7 +115,10 @@ var suiteTop = describe('utils.type.isTopLevel', function(){
             "/readme.txt",
             "/changelog",
             "/dataset_description.yml",
-            "/ses.json"
+            "/ses.json",
+            "/_T1w.json",
+            "/_dwi.json",
+            "/_task-test_physio.json"
         ];
 
         badFilenames.forEach(function (path) {

utils/type.js

@@ -42,16 +42,16 @@ module.exports = {
         var funcTopRe = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+_)?(?:recording-[a-zA-Z0-9]+_)?task-[a-zA-Z0-9]+(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:_echo-[0-9]+)?'
             + '(_bold.json|_sbref.json|_events.json|_events.tsv|_physio.json|_stim.json|_beh.json)$');
 
-        var anatTopRe = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+_)?(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+_)?'
+        var anatTopRe = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?'
             + '(' + anatSuffixes.join("|") + ').json$');
 
-        var dwiTopRe = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+)?(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:_)?'
+        var dwiTopRe = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?'
             + 'dwi.(?:json|bval|bvec)$');
 
         var multiDirFieldmapRe = new RegExp('^\\/(?:dir-[a-zA-Z0-9]+)_epi.json$');
 
-        var otherTopFiles = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+_)?(?:recording-[a-zA-Z0-9]+)?(?:task-[a-zA-Z0-9]+_)?(?:_acq-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?'
-            + '(_physio.json|_stim.json)$');
+        var otherTopFiles = new RegExp('^\\/(?:ses-[a-zA-Z0-9]+_)?(?:recording-[a-zA-Z0-9]+_)?(?:task-[a-zA-Z0-9]+_)?(?:acq-[a-zA-Z0-9]+_)?(?:rec-[a-zA-Z0-9]+_)?(?:run-[0-9]+_)?'
+            + '(physio.json|stim.json)$');
 
         return (fixedTopLevelNames.indexOf(path) != -1 || funcTopRe.test(path) || dwiTopRe.test(path) ||
         anatTopRe.test(path) || multiDirFieldmapRe.test(path) || otherTopFiles.test(path));
@@ -229,6 +229,3 @@ function conditionalMatch (expression, path) {
         }
         return false;
 }
-
-
-