Fix handling of IssueErrors thrown from hed-validator

bids-validator/validators/hed.js

@@ -29,14 +29,23 @@ async function checkHedStrings(tsvs, jsonContents, jsonFiles) {
     )
   }
 
+  if (hedSchemas === null) {
+    return [new Issue({ code: 109, file: datasetDescriptionData.file })]
+  }
+
   const issues = []
   for (const [sidecarName, sidecarContents] of Object.entries(jsonContents)) {
+    let sidecarFile
     try {
-      const sidecarFile = buildSidecar(sidecarName, sidecarContents, jsonFiles)
-      issues.push(...validateFile(sidecarFile, hedSchemas))
-    } catch (e) {
-      issues.push(new Issue({ code: 109 }))
-      return issues
+      sidecarFile = buildSidecar(sidecarName, sidecarContents, jsonFiles)
+      issues.push(...sidecarFile.validate(hedSchemas))
+    } catch (issueError) {
+      issues.push(
+        ...hedValidator.bids.BidsHedIssue.fromHedIssues(
+          issueError,
+          getSidecarFileObject(sidecarName, jsonFiles),
+        ),
+      )
     }
   }
 
@@ -45,12 +54,14 @@ async function checkHedStrings(tsvs, jsonContents, jsonFiles) {
   }
 
   for (const tsv of tsvs) {
+    let tsvFile
     try {
-      const tsvFile = buildTsv(tsv, jsonContents)
-      issues.push(...validateFile(tsvFile, hedSchemas))
-    } catch (e) {
-      issues.push(new Issue({ code: 109 }))
-      return issues
+      tsvFile = buildTsv(tsv, jsonContents)
+      issues.push(...tsvFile.validate(hedSchemas))
+    } catch (issueError) {
+      issues.push(
+        ...hedValidator.bids.BidsHedIssue.fromHedIssues(issueError, tsv.file),
+      )
     }
   }
 
@@ -81,14 +92,6 @@ function buildTsv(tsv, jsonContents) {
   )
 }
 
-function validateFile(file, hedSchemas) {
-  const issues = file.validate(hedSchemas)
-  if (issues === null) {
-    throw new Error()
-  }
-  return issues
-}
-
 function getSidecarFileObject(sidecarName, jsonFiles) {
   return jsonFiles.filter((file) => {
     return file.relativePath === sidecarName