rf: Raise more issue-like objects for TSV

Author: effigies

src/files/tsv.test.ts

@@ -53,7 +53,7 @@ Deno.test('TSV loading', async (t) => {
     try {
       await loadTSV(file)
     } catch (e: any) {
-      assertObjectMatch(e, { key: 'TSV_EMPTY_LINE', line: 3 })
+      assertObjectMatch(e, { code: 'TSV_EMPTY_LINE', line: 3 })
     }
   })
 
@@ -64,7 +64,7 @@ Deno.test('TSV loading', async (t) => {
     try {
       await loadTSV(file)
     } catch (e: any) {
-      assertObjectMatch(e, { key: 'TSV_EQUAL_ROWS', line: 3 })
+      assertObjectMatch(e, { code: 'TSV_EQUAL_ROWS', location: '/mismatched_row.tsv', line: 3 })
     }
   })
 
@@ -171,7 +171,7 @@ Deno.test('TSV loading', async (t) => {
       await loadTSV(file)
       assert(false, 'Expected error')
     } catch (e: any) {
-      assertObjectMatch(e, { key: 'TSV_COLUMN_HEADER_DUPLICATE', evidence: 'a, a' })
+      assertObjectMatch(e, { code: 'TSV_COLUMN_HEADER_DUPLICATE', issueMessage: 'a, a' })
     }
   })
 

src/files/tsv.ts

@@ -19,7 +19,11 @@ async function _loadTSV(file: BIDSFile, maxRows: number = -1): Promise<ColumnsMa
     const headers = (headerRow.done || !headerRow.value) ? [] : headerRow.value.split('\t')
 
     if (new Set(headers).size !== headers.length) {
-      throw { key: 'TSV_COLUMN_HEADER_DUPLICATE', evidence: headers.join(', ') }
+      throw {
+        code: 'TSV_COLUMN_HEADER_DUPLICATE',
+        location: file.path,
+        issueMessage: headers.join(', '),
+      }
     }
 
     // Initialize columns in array for construction efficiency
@@ -36,12 +40,12 @@ async function _loadTSV(file: BIDSFile, maxRows: number = -1): Promise<ColumnsMa
       if (!value) {
         const nextRow = await reader.read()
         if (nextRow.done) break
-        throw { key: 'TSV_EMPTY_LINE', line: rowIndex + 2 }
+        throw { code: 'TSV_EMPTY_LINE', location: file.path, line: rowIndex + 2 }
       }
 
       const values = value.split('\t')
       if (values.length !== headers.length) {
-        throw { key: 'TSV_EQUAL_ROWS', line: rowIndex + 2 }
+        throw { code: 'TSV_EQUAL_ROWS', location: file.path, line: rowIndex + 2 }
       }
       columns.forEach((column, columnIndex) => {
         // Double array size if we exceed the current capacity

src/schema/context.ts

@@ -248,8 +248,8 @@ export class BIDSContext implements Context {
 
     this.columns = await loadTSV(this.file, this.dataset.options?.maxRows)
       .catch((error) => {
-        if (error.key) {
-          this.dataset.issues.add({ code: error.key, location: this.file.path })
+        if (error.code) {
+          this.dataset.issues.add({ ...error, location: this.file.path })
         }
         logger.warn(
           `tsv file could not be opened by loadColumns '${this.file.path}'`,