Merge branch 'master' of github.com:bids-standard/bids-validator into…

… fix/deno_2_test_and_build

bids-validator/build.ts

@@ -1,12 +1,12 @@
-#!/usr/bin/env -S deno run --allow-read --allow-write --allow-env --allow-net --allow-run
+#!/usr/bin/env -S deno run --allow-read --allow-write --allow-env --allow-net --allow-run --reload
 /**
  * Build the schema based validator for distribution (web and npm), targets browser compatible ESM
  *
  * If you would like to use this package in a Node.js project, you'll need to use native ESM or a transform system
  */
 import * as esbuild from 'https://deno.land/x/esbuild@v0.24.0/mod.js'
 import { parse } from 'https://deno.land/std@0.223.0/flags/mod.ts'
-import { denoPlugins } from "jsr:@luca/esbuild-deno-loader@0.11.0"
+import { denoPlugins } from "jsr:@luca/esbuild-deno-loader@0.10.3"
 import * as path from "https://deno.land/std@0.223.0/path/mod.ts"
 import { getVersion } from './src/version.ts'
 

bids-validator/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@bids/validator",
-  "version": "1.14.13",
+  "version": "1.14.14",
   "exports": {
     ".": "./src/bids-validator.ts",
     "./main": "./src/main.ts",

legacy/bids-validator-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bids-validator-web",
-  "version": "1.14.14-dev.0",
+  "version": "1.14.15-dev.0",
   "description": "web client for bids-validator",
   "main": "index.js",
   "license": "MIT",

legacy/bids-validator/bids_validator/rules/file_level_rules.json

@@ -141,6 +141,17 @@
       "@@@_anat_ext_@@@": ["nii\\.gz", "nii", "json"]
     }
   },
+  "anat_cont": {
+    "regexp": "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?:_task-[a-zA-Z0-9]+)?(?:_acq-[a-zA-Z0-9]+)?(?:_ce-[a-zA-Z0-9]+)?(?:_rec-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?(?:_echo-[0-9]+)?(?:_part-(imag|mag|phase|real))?(?:_recording-[a-zA-Z0-9]+)?(?:_chunk-[0-9]+)?(?:@@@_cont_ext_@@@)$",
+    "tokens": {
+      "@@@_cont_ext_@@@": [
+        "_physio\\.tsv\\.gz",
+        "_stim\\.tsv\\.gz",
+        "_physio\\.json",
+        "_stim\\.json"
+      ]
+    }
+  },
 
   "behavioral": {
     "regexp": "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?_task-[a-zA-Z0-9]+(?:_acq-[a-zA-Z0-9]+)?(?:_run-[0-9]+)?((?:@@@_behavioral_ext_@@@)|(?:_recording-[a-zA-Z0-9]+)?(?:@@@_cont_ext_@@@))$",

legacy/bids-validator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bids-validator",
-  "version": "1.14.14-dev.0",
+  "version": "1.14.15-dev.0",
   "description": "",
   "main": "./dist/commonjs/index.js",
   "exports": {

legacy/bids-validator/utils/type.js

@@ -29,6 +29,7 @@ const anatMultiInv = buildRegExp(file_level_rules.anat_multiinv)
 const anatMP2RAGE = buildRegExp(file_level_rules.anat_mp2rage)
 const anatVFAMT = buildRegExp(file_level_rules.anat_vfa_mt)
 const anatMTR = buildRegExp(file_level_rules.anat_mtr)
+const anatCont = buildRegExp(file_level_rules.anat_cont)
 const behavioralData = buildRegExp(file_level_rules.behavioral)
 const dwiData = buildRegExp(file_level_rules.dwi)
 const eegData = buildRegExp(file_level_rules.eeg)
@@ -242,7 +243,8 @@ export default {
         conditionalMatch(anatMultiInv, path) ||
         conditionalMatch(anatMP2RAGE, path) ||
         conditionalMatch(anatVFAMT, path) ||
-        conditionalMatch(anatMTR, path)
+        conditionalMatch(anatMTR, path) ||
+        conditionalMatch(anatCont, path)
       )
     },
 

legacy/bids-validator/validators/session.js

@@ -11,15 +11,12 @@ import isNode from '../utils/isNode'
  * files from the set.
  */
 const session = function missingSessionFiles(fileList) {
-  const issues = []
   const { subjects, sessions } = getDataOrganization(fileList)
-
-  issues.push(...missingSessionWarnings(subjects, sessions))
-
   const subject_files = getSubjectFiles(subjects)
-  issues.push(...missingFileWarnings(subjects, subject_files))
-
-  return issues
+  return [
+    ...missingSessionWarnings(subjects, sessions),
+    ...missingFileWarnings(subjects, subject_files),
+  ]
 }
 
 /**

legacy/lerna.json

@@ -1,4 +1,4 @@
 {
   "packages": ["bids-validator", "bids-validator-web"],
-  "version": "1.14.14-dev.0"
+  "version": "1.14.15-dev.0"
 }