Merge branch 'main' into dev

Author: effigies

CHANGELOG.md

@@ -1,4 +1,11 @@
 
+<a id='changelog-2.0.7'></a>
+# 2.0.7 — 2025-06-03
+
+## Changed
+
+- Handle TSV schema rules with missing or `n/a` values for `additional_columns`.
+
 <a id='changelog-"2.0.6"'></a>
 # "2.0.6" — 2025-05-23
 

pyproject.toml

@@ -43,8 +43,8 @@ build = "cp39-*"
 skip = "*musllinux* *_i686 *-win32"
 build-frontend = "build"
 
-manylinux-x86_64-image = "quay.io/pypa/manylinux_2_24_x86_64:latest"
-manylinux-aarch64-image = "quay.io/pypa/manylinux_2_24_aarch64:latest"
+manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64:latest"
+manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64:latest"
 
 before-build = "curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh && deno --version"
 test-command = "bids-validator-deno --version"

src/schema/tables.ts

@@ -239,6 +239,11 @@ export function evalAdditionalColumns(
   if (context.extension !== '.tsv') return
   const headers = Object.keys(context?.columns)
   if (rule.columns) {
+    if (!rule.additional_columns || rule.additional_columns === 'n/a' ) {
+      // Old schemas might be missing the field, so be permissive.
+      // New schemas indicate it is not applicable with 'n/a'.
+      return
+    }
     const ruleHeadersNames = Object.keys(rule.columns).map(
       // @ts-expect-error
       (x) => schema.objects.columns[x].name,
@@ -250,11 +255,11 @@ export function evalAdditionalColumns(
     if (rule.additional_columns?.startsWith('allowed')) {
       extraCols = extraCols.filter((header) => !(header in context.sidecar))
     }
-    const code = rule.additional_columns === 'allowed'
-      ? 'TSV_ADDITIONAL_COLUMNS_UNDEFINED'
+    const code = rule.additional_columns === 'not_allowed'
+      ? 'TSV_ADDITIONAL_COLUMNS_NOT_ALLOWED'
       : rule.additional_columns === 'allowed_if_defined'
       ? 'TSV_ADDITIONAL_COLUMNS_MUST_DEFINE'
-      : 'TSV_ADDITIONAL_COLUMNS_NOT_ALLOWED'
+      : 'TSV_ADDITIONAL_COLUMNS_UNDEFINED'
     const issue = {
       code,
       location: context.path,