Merge remote-tracking branches 'upstream/master' and 'upstream/depend…

…abot/github_actions/actions/upload-artifact-4' into dependabot/github_actions/actions/download-artifact-4

.github/workflows/deno_tests.yml

@@ -22,7 +22,7 @@ jobs:
           deno-version: v1.x
       - run: ./build.ts
         working-directory: ./bids-validator
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: main
           path: bids-validator/dist/validator

.github/workflows/docker-build-push.yml

@@ -39,7 +39,7 @@ jobs:
       - push_docker_to_registry
     steps:
       - name: Set up Go 1.13
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.13
         id: go

bids-validator/package.json

@@ -45,7 +45,7 @@
     "date-fns": "^2.30.0",
     "events": "^3.3.0",
     "exifreader": "^4.17.0",
-    "hed-validator": "^3.12.0",
+    "hed-validator": "^3.13.1",
     "ignore": "^5.3.0",
     "is-utf8": "^0.2.1",
     "jest": "^29.7.0",

bids-validator/src/tests/local/empty_files.test.ts

@@ -23,15 +23,16 @@ Deno.test('empty_files dataset', async (t) => {
   })
 
   // *.meg4 and BadChannels files are empty. But only *.meg4 is an issue
+  /*
+   * https://github.com/bids-standard/bids-validator/issues/1862
+   * Commented out meat of tests, and updated first test to expect no issues.
+   */
   await t.step(
     'EMPTY_FILES error is thrown for only sub-0001_task-AEF_run-01_meg.meg4',
     () => {
       const issue = result.issues.get('EMPTY_FILE')
-      assert(issue, 'EMPTY_FILES was not thrown as expected')
-      assertObjectMatch(issue, {
-        key: 'EMPTY_FILE',
-        severity: 'error',
-      })
+      assertEquals(issue, undefined, 'EMPTY_FILES was not thrown as expected')
+      /*
       assert(
         issue.files.get(
           '/sub-0001/meg/sub-0001_task-AEF_run-01_meg.ds/sub-0001_task-AEF_run-01_meg.meg4',
@@ -45,6 +46,7 @@ Deno.test('empty_files dataset', async (t) => {
         undefined,
         'BadChannels should not be included in EMPTY_FILES error',
       )
+      */
     },
   )
 })

bids-validator/validators/hed.js

@@ -97,20 +97,8 @@ function getSidecarFileObject(sidecarName, jsonFiles) {
 
 function detectHed(tsvData, sidecarData) {
   return (
-    sidecarData.some((sidecarFileData) => {
-      return Object.values(sidecarFileData.sidecarData).some(sidecarValueHasHed)
-    }) ||
-    tsvData.some((tsvFileData) => {
-      return tsvFileData.parsedTsv.headers.indexOf('HED') !== -1
-    })
-  )
-}
-
-function sidecarValueHasHed(sidecarValue) {
-  return (
-    sidecarValue !== null &&
-    typeof sidecarValue === 'object' &&
-    sidecarValue.HED !== undefined
+    sidecarData.some((sidecarFileData) => sidecarFileData.hasHedData()) ||
+    tsvData.some((tsvFileData) => tsvFileData.hasHedData())
   )
 }