Merge pull request #194 from hed-standard/fix-tag-group-equivalence

Fix bug with tag group equivalence that was causing tests to fail
hed-standard · Sep 14, 2024 · ae7c2ff · ae7c2ff
2 parents db0b4ae + 0037c24
commit ae7c2ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/bids/validator/bidsHedTsvValidator.js b/bids/validator/bidsHedTsvValidator.js
@@ -322,7 +322,7 @@ export class BidsHedTsvParser {
     const columnSpliceMapping = new Map()
 
     for (const [columnName, columnValue] of rowCells.entries()) {
-      if (columnValue === 'n/a') {
+      if (columnValue === 'n/a' || columnValue === '') {
         columnSpliceMapping.set(columnName, null)
         continue
       }

diff --git a/parser/parsedHedGroup.js b/parser/parsedHedGroup.js
@@ -451,7 +451,11 @@ export class ParsedHedGroup extends ParsedHedSubstring {
     if (!(other instanceof ParsedHedGroup)) {
       return false
     }
-    return differenceWith(this.tags, other.tags, (ours, theirs) => ours.equivalent(theirs)).length === 0
+    const equivalence = (ours, theirs) => ours.equivalent(theirs)
+    return (
+      differenceWith(this.tags, other.tags, equivalence).length === 0 &&
+      differenceWith(other.tags, this.tags, equivalence).length === 0
+    )
   }
 
   /**

diff --git a/spec_tests/jsonTests.spec.js b/spec_tests/jsonTests.spec.js
@@ -21,7 +21,7 @@ const skippedErrors = {
 }
 const readFileSync = fs.readFileSync
 const test_file_name = 'javascript_tests.json'
-//const test_file_name = 'temp3.json';
+//const test_file_name = 'temp3.json'
 
 function comboListToStrings(items) {
   const comboItems = []