From db22e4a88e0b8a5f760890cb94138d2f3747a2e6 Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Mon, 31 Aug 2020 12:08:16 -0500
Subject: [PATCH 1/3] add schemas directory, direct copy from spec repo yml
 files

---
 bids-validator/package.json                   |   1 +
 bids-validator/schemas/associated_data.yaml   |   9 ++
 .../schemas/auxdatatypes/channels.yaml        |  15 ++
 .../schemas/auxdatatypes/electrodes.yaml      |  14 ++
 .../schemas/auxdatatypes/events.yaml          |  15 ++
 .../schemas/auxdatatypes/photo.yaml           |  13 ++
 bids-validator/schemas/datatypes/anat.yaml    |  58 ++++++++
 bids-validator/schemas/datatypes/beh.yaml     |  28 ++++
 bids-validator/schemas/datatypes/dwi.yaml     |  43 ++++++
 bids-validator/schemas/datatypes/eeg.yaml     |  33 +++++
 bids-validator/schemas/datatypes/fmap.yaml    |  33 +++++
 bids-validator/schemas/datatypes/func.yaml    |  52 +++++++
 bids-validator/schemas/datatypes/ieeg.yaml    |  34 +++++
 bids-validator/schemas/datatypes/meg.yaml     |  62 ++++++++
 bids-validator/schemas/entities.yaml          | 135 ++++++++++++++++++
 bids-validator/schemas/index.js               |  61 ++++++++
 bids-validator/schemas/modalities.yaml        |  24 ++++
 bids-validator/schemas/python_regex.json      |  39 +++++
 bids-validator/schemas/regex.json             |  39 +++++
 bids-validator/schemas/top_level_files.yaml   |  26 ++++
 bids-validator/utils/schemaTypes.js           |  15 ++
 bids-validator/utils/type.js                  |   8 +-
 22 files changed, 756 insertions(+), 1 deletion(-)
 create mode 100644 bids-validator/schemas/associated_data.yaml
 create mode 100644 bids-validator/schemas/auxdatatypes/channels.yaml
 create mode 100644 bids-validator/schemas/auxdatatypes/electrodes.yaml
 create mode 100644 bids-validator/schemas/auxdatatypes/events.yaml
 create mode 100644 bids-validator/schemas/auxdatatypes/photo.yaml
 create mode 100644 bids-validator/schemas/datatypes/anat.yaml
 create mode 100644 bids-validator/schemas/datatypes/beh.yaml
 create mode 100644 bids-validator/schemas/datatypes/dwi.yaml
 create mode 100644 bids-validator/schemas/datatypes/eeg.yaml
 create mode 100644 bids-validator/schemas/datatypes/fmap.yaml
 create mode 100644 bids-validator/schemas/datatypes/func.yaml
 create mode 100644 bids-validator/schemas/datatypes/ieeg.yaml
 create mode 100644 bids-validator/schemas/datatypes/meg.yaml
 create mode 100644 bids-validator/schemas/entities.yaml
 create mode 100644 bids-validator/schemas/index.js
 create mode 100644 bids-validator/schemas/modalities.yaml
 create mode 100644 bids-validator/schemas/python_regex.json
 create mode 100644 bids-validator/schemas/regex.json
 create mode 100644 bids-validator/schemas/top_level_files.yaml
 create mode 100644 bids-validator/utils/schemaTypes.js

diff --git a/bids-validator/package.json b/bids-validator/package.json
index e65ab54ae..51fdb7000 100644
--- a/bids-validator/package.json
+++ b/bids-validator/package.json
@@ -30,6 +30,7 @@
     "hed-validator": "^1.3.2",
     "ignore": "^4.0.2",
     "is-utf8": "^0.2.1",
+    "js-yaml": "^3.14.0",
     "jshint": "^2.9.6",
     "lerna": "^3.15.0",
     "minimatch": "3.0.4",
diff --git a/bids-validator/schemas/associated_data.yaml b/bids-validator/schemas/associated_data.yaml
new file mode 100644
index 000000000..b54ca34fb
--- /dev/null
+++ b/bids-validator/schemas/associated_data.yaml
@@ -0,0 +1,9 @@
+---
+- code/:
+    - required: false
+- derivatives/:
+    - required: false
+- sourcedata/:
+    - required: false
+- stimuli/:
+    - required: false
diff --git a/bids-validator/schemas/auxdatatypes/channels.yaml b/bids-validator/schemas/auxdatatypes/channels.yaml
new file mode 100644
index 000000000..a90620897
--- /dev/null
+++ b/bids-validator/schemas/auxdatatypes/channels.yaml
@@ -0,0 +1,15 @@
+---
+- datatypes:
+    - meg
+    - eeg
+    - ieeg
+  suffixes:
+    - channels
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    run: optional
diff --git a/bids-validator/schemas/auxdatatypes/electrodes.yaml b/bids-validator/schemas/auxdatatypes/electrodes.yaml
new file mode 100644
index 000000000..b630ad589
--- /dev/null
+++ b/bids-validator/schemas/auxdatatypes/electrodes.yaml
@@ -0,0 +1,14 @@
+---
+- datatypes:
+    - eeg
+    - ieeg
+  suffixes:
+    - electrodes
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    space: optional
diff --git a/bids-validator/schemas/auxdatatypes/events.yaml b/bids-validator/schemas/auxdatatypes/events.yaml
new file mode 100644
index 000000000..3c0ec521c
--- /dev/null
+++ b/bids-validator/schemas/auxdatatypes/events.yaml
@@ -0,0 +1,15 @@
+---
+- datatypes:
+    - meg
+    - eeg
+    - ieeg
+  suffixes:
+    - events
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    run: optional
diff --git a/bids-validator/schemas/auxdatatypes/photo.yaml b/bids-validator/schemas/auxdatatypes/photo.yaml
new file mode 100644
index 000000000..e104d04aa
--- /dev/null
+++ b/bids-validator/schemas/auxdatatypes/photo.yaml
@@ -0,0 +1,13 @@
+---
+- datatypes:
+    - meg
+    - eeg
+    - ieeg
+  suffixes:
+    - photo
+  extensions:
+    - .jpg
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
diff --git a/bids-validator/schemas/datatypes/anat.yaml b/bids-validator/schemas/datatypes/anat.yaml
new file mode 100644
index 000000000..6d2f296c9
--- /dev/null
+++ b/bids-validator/schemas/datatypes/anat.yaml
@@ -0,0 +1,58 @@
+---
+# First group
+- suffixes:
+    - T1w
+    - T2w
+    - T1rho
+    - T1map
+    - T2map
+    - T2star
+    - FLAIR
+    - FLASH
+    - PD
+    - PDmap
+    - PDT2
+    - inplaneT1
+    - inplaneT2
+    - angio
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    run: optional
+    acq: optional
+    ce: optional
+    rec: optional
+# Second group
+- suffixes:
+    - defacemask
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    run: optional
+    acq: optional
+    ce: optional
+    rec: optional
+    mod: optional
+# Third group
+- suffixes:
+    - physio
+    - stim
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    run: optional
+    acq: optional
+    ce: optional
+    rec: optional
+    recording: optional
diff --git a/bids-validator/schemas/datatypes/beh.yaml b/bids-validator/schemas/datatypes/beh.yaml
new file mode 100644
index 000000000..536e88321
--- /dev/null
+++ b/bids-validator/schemas/datatypes/beh.yaml
@@ -0,0 +1,28 @@
+---
+# First group
+- suffixes:
+    - stim
+    - physio
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+    recording: optional
+# Second group
+- suffixes:
+    - events
+    - beh
+  extensions:
+    - .tsv
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
diff --git a/bids-validator/schemas/datatypes/dwi.yaml b/bids-validator/schemas/datatypes/dwi.yaml
new file mode 100644
index 000000000..40f516e47
--- /dev/null
+++ b/bids-validator/schemas/datatypes/dwi.yaml
@@ -0,0 +1,43 @@
+---
+# First group
+- suffixes:
+    - dwi
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+    - .bvec
+    - .bval
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    dir: optional
+    run: optional
+# Second group
+- suffixes:
+    - sbref
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    dir: optional
+    run: optional
+# Third group
+- suffixes:
+    - physio
+    - stim
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    dir: optional
+    run: optional
+    recording: optional
diff --git a/bids-validator/schemas/datatypes/eeg.yaml b/bids-validator/schemas/datatypes/eeg.yaml
new file mode 100644
index 000000000..101c4b5c7
--- /dev/null
+++ b/bids-validator/schemas/datatypes/eeg.yaml
@@ -0,0 +1,33 @@
+---
+# First group
+- suffixes:
+    - eeg
+  extensions:
+    - .json
+    - .edf
+    - .vhdr
+    - .vmrk
+    - .eeg
+    - .set
+    - .fdt
+    - .bdf
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+# Second group
+- suffixes:
+    - physio
+    - stim
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+    recording: optional
diff --git a/bids-validator/schemas/datatypes/fmap.yaml b/bids-validator/schemas/datatypes/fmap.yaml
new file mode 100644
index 000000000..98d0f6c45
--- /dev/null
+++ b/bids-validator/schemas/datatypes/fmap.yaml
@@ -0,0 +1,33 @@
+---
+# First group
+- suffixes:
+    - phasediff
+    - phase1
+    - phase2
+    - magnitude1
+    - magnitude2
+    - magnitude
+    - fieldmap
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    run: optional
+# Second group
+- suffixes:
+    - epi
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    ce: optional
+    dir: required
+    run: optional
diff --git a/bids-validator/schemas/datatypes/func.yaml b/bids-validator/schemas/datatypes/func.yaml
new file mode 100644
index 000000000..62a26b60b
--- /dev/null
+++ b/bids-validator/schemas/datatypes/func.yaml
@@ -0,0 +1,52 @@
+---
+# First group
+- suffixes:
+    - bold
+    - cbv
+    - phase
+    - sbref
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    ce: optional
+    rec: optional
+    dir: optional
+    run: optional
+    echo: optional
+# Second group
+- suffixes:
+    - events
+  extensions:
+    - .tsv
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    ce: optional
+    rec: optional
+    dir: optional
+    run: optional
+    echo: optional
+# Third group
+- suffixes:
+    - physio
+    - stim
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    rec: optional
+    run: optional
+    recording: optional
diff --git a/bids-validator/schemas/datatypes/ieeg.yaml b/bids-validator/schemas/datatypes/ieeg.yaml
new file mode 100644
index 000000000..0a4fda251
--- /dev/null
+++ b/bids-validator/schemas/datatypes/ieeg.yaml
@@ -0,0 +1,34 @@
+---
+# First group
+- suffixes:
+    - ieeg
+  extensions:
+    - .mefd/
+    - .json
+    - .edf
+    - .vhdr
+    - .eeg
+    - .vmrk
+    - .set
+    - .fdt
+    - .nwb
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+# Second group
+- suffixes:
+    - physio
+    - stim
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+    recording: optional
diff --git a/bids-validator/schemas/datatypes/meg.yaml b/bids-validator/schemas/datatypes/meg.yaml
new file mode 100644
index 000000000..5b72b0b6c
--- /dev/null
+++ b/bids-validator/schemas/datatypes/meg.yaml
@@ -0,0 +1,62 @@
+---
+# First group
+- suffixes:
+    - meg
+  extensions:
+    - / # corresponds to BTi/4D data
+    - .ds/
+    - .json
+    - .fif
+    - .sqd
+    - .con
+    - .raw
+    - .ave
+    - .mrk
+    - .kdf
+    - .mhd
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+    proc: optional
+    split: optional
+# Second group
+- suffixes:
+    - headshape
+  extensions:
+    - .pos
+    - .txt
+  entities:
+    sub: required
+    ses: optional
+    acq: optional
+    space: optional
+- suffixes:
+    - markers
+  extensions:
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: optional
+    acq: optional
+    space: optional
+# Third group
+- suffixes:
+    - physio
+    - stim
+  extensions:
+    - .tsv.gz
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    run: optional
+    proc: optional
+    split: optional
+    space: optional
+    recording: optional
diff --git a/bids-validator/schemas/entities.yaml b/bids-validator/schemas/entities.yaml
new file mode 100644
index 000000000..bc04a1591
--- /dev/null
+++ b/bids-validator/schemas/entities.yaml
@@ -0,0 +1,135 @@
+---
+sub:
+  name: Subject
+  description: |
+    A person or animal participating in the study.
+  format: label
+ses:
+  name: Session
+  description: |
+    A logical grouping of neuroimaging and behavioral data consistent across
+    subjects.
+    Session can (but doesn't have to) be synonymous to a visit in a
+    longitudinal study.
+    In general, subjects will stay in the scanner during one session.
+    However, for example, if a subject has to leave the scanner room and then
+    be re-positioned on the scanner bed, the set of MRI acquisitions will still
+    be considered as a session and match sessions acquired in other subjects.
+    Similarly, in situations where different data types are obtained over
+    several visits (for example fMRI on one day followed by DWI the day after)
+    those can be grouped in one session.
+    Defining multiple sessions is appropriate when several identical or similar
+    data acquisitions are planned and performed on all -or most- subjects,
+    often in the case of some intervention between sessions (e.g., training).
+  format: label
+task:
+  name: Task
+  format: label
+  description: |
+    Each task has a unique label that MUST only consist of letters and/or
+    numbers (other characters, including spaces and underscores, are not
+    allowed).
+    Those labels MUST be consistent across subjects and sessions.
+acq:
+  name: Acquisition
+  description: |
+    The OPTIONAL acq-<label> key/value pair corresponds to a custom label the
+    user MAY use to distinguish a different set of parameters used for
+    acquiring the same modality.
+    For example this should be used when a study includes two T1w images - one
+    full brain low resolution and and one restricted field of view but high
+    resolution.
+    In such case two files could have the following names:
+    sub-01_acq-highres_T1w.nii.gz and sub-01_acq-lowres_T1w.nii.gz, however the
+    user is free to choose any other label than highres and lowres as long as
+    they are consistent across subjects and sessions.
+    In case different sequences are used to record the same modality (e.g. RARE
+    and FLASH for T1w) this field can also be used to make that distinction.
+    At what level of detail to make the distinction (e.g. just between RARE and
+    FLASH, or between RARE, FLASH, and FLASHsubsampled) remains at the
+    discretion of the researcher.
+  format: label
+ce:
+  name: Contrast Enhancing Agent
+  description: |
+    Similarly the OPTIONAL ce-<label> key/value can be used to distinguish
+    sequences using different contrast enhanced images.
+    The label is the name of the contrast agent.
+    The key ContrastBolusIngredient MAY be also be added in the JSON file, with
+    the same label.
+  format: label
+rec:
+  name: Reconstruction
+  description: |
+    Similarly the OPTIONAL rec-<label> key/value can be used to distinguish
+    different reconstruction algorithms (for example ones using motion
+    correction).
+  format: label
+dir:
+  name: Phase-Encoding Direction
+  description: |
+    Similarly the OPTIONAL dir-<label> key/value can be used to distinguish
+    different phase-encoding directions.
+  format: label
+run:
+  name: Run
+  description: |
+    If several scans of the same modality are acquired they MUST be indexed
+    with a key-value pair: `_run-1`, `_run-2`, `_run-3` etc. (only integers
+    are allowed as run labels).
+    When there is only one scan of a given type the run key MAY be omitted.
+    Please note that diffusion imaging data is stored elsewhere (see below).
+  format: index
+mod:
+  name: Corresponding Modality
+  description: |
+    In such cases the OPTIONAL `mod-<label>` key/value pair corresponds to
+    modality label for eg: T1w, inplaneT1, referenced by a defacemask image.
+    E.g., sub-01_mod-T1w_defacemask.nii.gz.
+  format: label
+echo:
+  name: Echo
+  description: |
+    Multi-echo data MUST be split into one file per echo.
+    Each file shares the same name with the exception of the `_echo-<index>`
+    key/value.
+  format: index
+recording:
+  name: Recording
+  description: |
+    More than one continuous recording file can be included (with different
+    sampling frequencies).
+    In such case use different labels.
+    For example: `_recording-contrast`, `_recording-saturation`.
+  format: label
+proc:
+  name: Processed (on device)
+  description: |
+    The proc label is analogous to rec for MR and denotes a variant of a file
+    that was a result of particular processing performed on the device.
+    This is useful for files produced in particular by Elekta’s MaxFilter
+    (e.g. sss, tsss, trans, quat, mc, etc.), which some installations impose to
+    be run on raw data because of active shielding software corrections before
+    the MEG data can actually be exploited.
+  format: label
+space:
+  name: Space
+  description: |
+    The optional space label (`*[_space-<label>]_electrodes.tsv`) can be used
+    to indicate the way in which electrode positions are interpreted.
+    The space label needs to be taken from the list in Appendix VIII.
+  format: label
+split:
+  name: Split
+  description: |
+    In the case of long data recordings that exceed a file size of 2Gb, the
+    .fif files are conventionally split into multiple parts.
+    Each of these files has an internal pointer to the next file.
+    This is important when renaming these split recordings to the BIDS
+    convention.
+    Instead of a simple renaming, files should be read in and saved under their
+    new names with dedicated tools like MNE, which will ensure that not only
+    the file names, but also the internal file pointers will be updated.
+    It is RECOMMENDED that .fif files with multiple parts use the
+    `split-<index>` entity to indicate each part.
+  format: index
diff --git a/bids-validator/schemas/index.js b/bids-validator/schemas/index.js
new file mode 100644
index 000000000..49a490b34
--- /dev/null
+++ b/bids-validator/schemas/index.js
@@ -0,0 +1,61 @@
+const yaml = require('js-yaml')
+const fs = require('fs')
+
+const datatypes = ['anat', 'beh', 'dwi', 'eeg', 'fmap', 'func', 'ieeg', 'meg']
+
+const generateRegex = (pythonRegex = false) => {
+  // Python regex needs a 'P' before matching group name
+  let P = pythonRegex ? 'P' : ''
+
+  const regex = {
+    label: '[a-zA-Z0-9]+',
+    index: '[0-9]+',
+    sub_ses_dirs:
+      '^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?',
+    type_dir: '[\\/\\\\]',
+    sub_ses_entity: '\\1(_\\2)?',
+    optional: '?',
+    required: '',
+  }
+
+  const entities = yaml.safeLoad(fs.readFileSync('./entities.yaml', 'utf8'))
+
+  let datatypes_yaml = {}
+  datatypes.map(x => {
+    datatypes_yaml[x] = yaml.safeLoad(
+      fs.readFileSync(`./datatypes/${x}.yaml`, 'utf8'),
+    )
+  })
+
+  datatypes_regex = {}
+  datatypes.map(type => {
+    datatypes_yaml[type].map(datatype_yaml => {
+      let file_regex = ''
+      file_regex = `${regex.sub_ses_dirs}${type}${regex.type_dir}${regex.sub_ses_entity}`
+      Object.keys(datatype_yaml.entities).map(entity => {
+        // sub and ses entities in file name handled by directory pattern matching groups
+        if (entity === 'sub' || entity === 'ses') {
+          return
+        }
+        file_regex = file_regex.concat(
+          `(?${P}<${entity}>_${entity}-${regex[entities[entity].format]})${
+            regex[datatype_yaml.entities[entity]]
+          }`,
+        )
+      })
+      let suffix_regex = `_(?${P}<suffix>${datatype_yaml.suffixes.join('|')})`
+      let ext_regex = `(?${P}<ext>${datatype_yaml.extensions.join('|')})`
+      file_regex = file_regex.concat(`${suffix_regex}${ext_regex}$`)
+      if (!datatypes_regex[type]) {
+        datatypes_regex[type] = []
+      }
+      datatypes_regex[type].push(file_regex)
+    })
+  })
+  console.log(datatypes_regex)
+  let filename = pythonRegex ? 'python_regex.json' : 'regex.json'
+  fs.writeFileSync(`./${filename}`, JSON.stringify(datatypes_regex, null, 2))
+}
+
+generateRegex()
+generateRegex(true)
diff --git a/bids-validator/schemas/modalities.yaml b/bids-validator/schemas/modalities.yaml
new file mode 100644
index 000000000..f49e671b6
--- /dev/null
+++ b/bids-validator/schemas/modalities.yaml
@@ -0,0 +1,24 @@
+---
+mri:
+  name: Magnetic Resonance Imaging
+  datatypes:
+    - anat
+    - dwi
+    - fmap
+    - func
+eeg:
+  name: Electroencephalography
+  datatypes:
+    - eeg
+ieeg:
+  name: Intracranial Electroencephalography
+  datatypes:
+    - ieeg
+meg:
+  name: Magnetoencephalography
+  datatypes:
+    - meg
+beh:
+  name: Behavioral experiments
+  datatypes:
+    - beh
diff --git a/bids-validator/schemas/python_regex.json b/bids-validator/schemas/python_regex.json
new file mode 100644
index 000000000..09d0b1348
--- /dev/null
+++ b/bids-validator/schemas/python_regex.json
@@ -0,0 +1,39 @@
+{
+  "anat": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?_(?P<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<mod>_mod-[a-zA-Z0-9]+)?_(?P<suffix>defacemask)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+  ],
+  "beh": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>stim|physio)(?P<ext>.tsv.gz|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>events|beh)(?P<ext>.tsv|.json)$"
+  ],
+  "dwi": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>dwi)(?P<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>sbref)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+  ],
+  "eeg": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>eeg)(?P<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+  ],
+  "fmap": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>phasediff|phase1|phase2|magnitude1|magnitude2|magnitude|fieldmap)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)(?P<run>_run-[0-9]+)?_(?P<suffix>epi)(?P<ext>.nii.gz|.nii|.json)$"
+  ],
+  "func": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<echo>_echo-[0-9]+)?_(?P<suffix>bold|cbv|phase|sbref)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<echo>_echo-[0-9]+)?_(?P<suffix>events)(?P<ext>.tsv|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+  ],
+  "ieeg": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>ieeg)(?P<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+  ],
+  "meg": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<proc>_proc-[a-zA-Z0-9]+)?(?P<split>_split-[0-9]+)?_(?P<suffix>meg)(?P<ext>/|.ds/|.json|.fif|.sqd|.con|.raw|.ave|.mrk|.kdf|.mhd)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?_(?P<suffix>headshape)(?P<ext>.pos|.txt)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?_(?P<suffix>markers)(?P<ext>.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<proc>_proc-[a-zA-Z0-9]+)?(?P<split>_split-[0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+  ]
+}
diff --git a/bids-validator/schemas/regex.json b/bids-validator/schemas/regex.json
new file mode 100644
index 000000000..78b36e078
--- /dev/null
+++ b/bids-validator/schemas/regex.json
@@ -0,0 +1,39 @@
+{
+  "anat": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?_(?<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<mod>_mod-[a-zA-Z0-9]+)?_(?<suffix>defacemask)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+  ],
+  "beh": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>stim|physio)(?<ext>.tsv.gz|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>events|beh)(?<ext>.tsv|.json)$"
+  ],
+  "dwi": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>dwi)(?<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>sbref)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+  ],
+  "eeg": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>eeg)(?<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+  ],
+  "fmap": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>phasediff|phase1|phase2|magnitude1|magnitude2|magnitude|fieldmap)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)(?<run>_run-[0-9]+)?_(?<suffix>epi)(?<ext>.nii.gz|.nii|.json)$"
+  ],
+  "func": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>bold|cbv|phase|sbref)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>events)(?<ext>.tsv|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+  ],
+  "ieeg": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>ieeg)(?<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+  ],
+  "meg": [
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<proc>_proc-[a-zA-Z0-9]+)?(?<split>_split-[0-9]+)?_(?<suffix>meg)(?<ext>/|.ds/|.json|.fif|.sqd|.con|.raw|.ave|.mrk|.kdf|.mhd)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>headshape)(?<ext>.pos|.txt)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>markers)(?<ext>.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<proc>_proc-[a-zA-Z0-9]+)?(?<split>_split-[0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+  ]
+}
diff --git a/bids-validator/schemas/top_level_files.yaml b/bids-validator/schemas/top_level_files.yaml
new file mode 100644
index 000000000..42b402a76
--- /dev/null
+++ b/bids-validator/schemas/top_level_files.yaml
@@ -0,0 +1,26 @@
+---
+README:
+  required: true
+  extensions:
+    - None
+CHANGES:
+  required: true
+  extensions:
+    - None
+LICENSE:
+  required: false
+  extensions:
+    - None
+dataset_description:
+  required: true
+  extensions:
+    - .json
+genetic_info:
+  required: false
+  extensions:
+    - .json
+participants:
+  required: false
+  extensions:
+    - .tsv
+    - .json
diff --git a/bids-validator/utils/schemaTypes.js b/bids-validator/utils/schemaTypes.js
new file mode 100644
index 000000000..50bf0d84a
--- /dev/null
+++ b/bids-validator/utils/schemaTypes.js
@@ -0,0 +1,15 @@
+import * as schemaRegex from '../schemas/regex.json'
+
+let regexStrs = schemaRegex.default
+console.log()
+const regexes = Object.values(regexStrs)
+  .flat()
+  .map(regexStr => {
+    return new RegExp(regexStr)
+  })
+
+export const _isBids = path => {
+  return regexes.some(regex => {
+    return !!regex.exec(path)
+  })
+}
diff --git a/bids-validator/utils/type.js b/bids-validator/utils/type.js
index 057fdcd98..0608d7200 100644
--- a/bids-validator/utils/type.js
+++ b/bids-validator/utils/type.js
@@ -6,6 +6,8 @@
  * BIDS specification requirements.
  */
 
+import { _isBids } from './schemaTypes'
+
 /**
  * Import RegExps from bids-validator-common
  */
@@ -64,11 +66,15 @@ export default {
    * bids spec.
    */
   isBIDS: function(path) {
+    // _isBids(path)
     return (
       this.file.isTopLevel(path) ||
       this.file.isStimuliData(path) ||
       this.file.isSessionLevel(path) ||
       this.file.isSubjectLevel(path) ||
+      this.file.isPhenotypic(path) ||
+      _isBids(path)
+      /*
       this.file.isAnat(path) ||
       this.file.isDWI(path) ||
       this.file.isFunc(path) ||
@@ -78,7 +84,7 @@ export default {
       this.file.isBehavioral(path) ||
       this.file.isCont(path) ||
       this.file.isFieldMap(path) ||
-      this.file.isPhenotypic(path)
+      */
     )
   },
 

From 0c44644786a5bac5d549c854631da29bd8713300 Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Tue, 8 Dec 2020 11:36:53 -0600
Subject: [PATCH 2/3] copy over latest schemas from spec

---
 .../schemas/auxdatatypes/channels.yaml        |   1 +
 .../schemas/auxdatatypes/events.yaml          |   1 +
 bids-validator/schemas/datatypes/anat.yaml    |  16 +-
 bids-validator/schemas/datatypes/dwi.yaml     |  16 +-
 bids-validator/schemas/datatypes/eeg.yaml     |  15 --
 bids-validator/schemas/datatypes/func.yaml    |  21 +-
 bids-validator/schemas/datatypes/ieeg.yaml    |  15 --
 bids-validator/schemas/datatypes/meg.yaml     |  19 +-
 bids-validator/schemas/entities.yaml          | 196 ++++++++++++++----
 bids-validator/schemas/index.js               |   4 +-
 bids-validator/schemas/json/bold.json         |  42 ++++
 .../schemas/json/common_definitions.json      |  62 ++++++
 .../schemas/json/coordsystem_eeg.json         |  20 ++
 .../schemas/json/coordsystem_ieeg.json        |  13 ++
 .../schemas/json/coordsystem_meg.json         |  38 ++++
 .../schemas/json/data_dictionary.json         |  42 ++++
 .../schemas/json/dataset_description.json     |  74 +++++++
 bids-validator/schemas/json/eeg.json          |  45 ++++
 bids-validator/schemas/json/genetic_info.json |  61 ++++++
 bids-validator/schemas/json/ieeg.json         |  49 +++++
 bids-validator/schemas/json/meg.json          |  75 +++++++
 bids-validator/schemas/json/physio.json       |  20 ++
 bids-validator/schemas/python_regex.json      |  24 +--
 bids-validator/schemas/regex.json             |  24 +--
 24 files changed, 745 insertions(+), 148 deletions(-)
 create mode 100644 bids-validator/schemas/json/bold.json
 create mode 100644 bids-validator/schemas/json/common_definitions.json
 create mode 100644 bids-validator/schemas/json/coordsystem_eeg.json
 create mode 100644 bids-validator/schemas/json/coordsystem_ieeg.json
 create mode 100644 bids-validator/schemas/json/coordsystem_meg.json
 create mode 100644 bids-validator/schemas/json/data_dictionary.json
 create mode 100644 bids-validator/schemas/json/dataset_description.json
 create mode 100644 bids-validator/schemas/json/eeg.json
 create mode 100644 bids-validator/schemas/json/genetic_info.json
 create mode 100644 bids-validator/schemas/json/ieeg.json
 create mode 100644 bids-validator/schemas/json/meg.json
 create mode 100644 bids-validator/schemas/json/physio.json

diff --git a/bids-validator/schemas/auxdatatypes/channels.yaml b/bids-validator/schemas/auxdatatypes/channels.yaml
index a90620897..f5b412824 100644
--- a/bids-validator/schemas/auxdatatypes/channels.yaml
+++ b/bids-validator/schemas/auxdatatypes/channels.yaml
@@ -12,4 +12,5 @@
     sub: required
     ses: optional
     task: required
+    acq: optional
     run: optional
diff --git a/bids-validator/schemas/auxdatatypes/events.yaml b/bids-validator/schemas/auxdatatypes/events.yaml
index 3c0ec521c..34a0d7943 100644
--- a/bids-validator/schemas/auxdatatypes/events.yaml
+++ b/bids-validator/schemas/auxdatatypes/events.yaml
@@ -12,4 +12,5 @@
     sub: required
     ses: optional
     task: required
+    acq: optional
     run: optional
diff --git a/bids-validator/schemas/datatypes/anat.yaml b/bids-validator/schemas/datatypes/anat.yaml
index 6d2f296c9..e0b8bad9f 100644
--- a/bids-validator/schemas/datatypes/anat.yaml
+++ b/bids-validator/schemas/datatypes/anat.yaml
@@ -26,6 +26,7 @@
     acq: optional
     ce: optional
     rec: optional
+    part: optional
 # Second group
 - suffixes:
     - defacemask
@@ -41,18 +42,3 @@
     ce: optional
     rec: optional
     mod: optional
-# Third group
-- suffixes:
-    - physio
-    - stim
-  extensions:
-    - .tsv.gz
-    - .json
-  entities:
-    sub: required
-    ses: optional
-    run: optional
-    acq: optional
-    ce: optional
-    rec: optional
-    recording: optional
diff --git a/bids-validator/schemas/datatypes/dwi.yaml b/bids-validator/schemas/datatypes/dwi.yaml
index 40f516e47..291db298e 100644
--- a/bids-validator/schemas/datatypes/dwi.yaml
+++ b/bids-validator/schemas/datatypes/dwi.yaml
@@ -14,6 +14,7 @@
     acq: optional
     dir: optional
     run: optional
+    part: optional
 # Second group
 - suffixes:
     - sbref
@@ -27,17 +28,4 @@
     acq: optional
     dir: optional
     run: optional
-# Third group
-- suffixes:
-    - physio
-    - stim
-  extensions:
-    - .tsv.gz
-    - .json
-  entities:
-    sub: required
-    ses: optional
-    acq: optional
-    dir: optional
-    run: optional
-    recording: optional
+    part: optional
diff --git a/bids-validator/schemas/datatypes/eeg.yaml b/bids-validator/schemas/datatypes/eeg.yaml
index 101c4b5c7..f00ae44c1 100644
--- a/bids-validator/schemas/datatypes/eeg.yaml
+++ b/bids-validator/schemas/datatypes/eeg.yaml
@@ -1,5 +1,4 @@
 ---
-# First group
 - suffixes:
     - eeg
   extensions:
@@ -17,17 +16,3 @@
     task: required
     acq: optional
     run: optional
-# Second group
-- suffixes:
-    - physio
-    - stim
-  extensions:
-    - .tsv.gz
-    - .json
-  entities:
-    sub: required
-    ses: optional
-    task: required
-    acq: optional
-    run: optional
-    recording: optional
diff --git a/bids-validator/schemas/datatypes/func.yaml b/bids-validator/schemas/datatypes/func.yaml
index 62a26b60b..8c99a3689 100644
--- a/bids-validator/schemas/datatypes/func.yaml
+++ b/bids-validator/schemas/datatypes/func.yaml
@@ -3,7 +3,6 @@
 - suffixes:
     - bold
     - cbv
-    - phase
     - sbref
   extensions:
     - .nii.gz
@@ -19,7 +18,25 @@
     dir: optional
     run: optional
     echo: optional
+    part: optional
 # Second group
+- suffixes:
+    - phase
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    sub: required
+    ses: optional
+    task: required
+    acq: optional
+    ce: optional
+    rec: optional
+    dir: optional
+    run: optional
+    echo: optional
+# Third group
 - suffixes:
     - events
   extensions:
@@ -35,7 +52,7 @@
     dir: optional
     run: optional
     echo: optional
-# Third group
+# Fourth group
 - suffixes:
     - physio
     - stim
diff --git a/bids-validator/schemas/datatypes/ieeg.yaml b/bids-validator/schemas/datatypes/ieeg.yaml
index 0a4fda251..ff7e09314 100644
--- a/bids-validator/schemas/datatypes/ieeg.yaml
+++ b/bids-validator/schemas/datatypes/ieeg.yaml
@@ -1,5 +1,4 @@
 ---
-# First group
 - suffixes:
     - ieeg
   extensions:
@@ -18,17 +17,3 @@
     task: required
     acq: optional
     run: optional
-# Second group
-- suffixes:
-    - physio
-    - stim
-  extensions:
-    - .tsv.gz
-    - .json
-  entities:
-    sub: required
-    ses: optional
-    task: required
-    acq: optional
-    run: optional
-    recording: optional
diff --git a/bids-validator/schemas/datatypes/meg.yaml b/bids-validator/schemas/datatypes/meg.yaml
index 5b72b0b6c..136178173 100644
--- a/bids-validator/schemas/datatypes/meg.yaml
+++ b/bids-validator/schemas/datatypes/meg.yaml
@@ -3,7 +3,7 @@
 - suffixes:
     - meg
   extensions:
-    - / # corresponds to BTi/4D data
+    - /  # corresponds to BTi/4D data
     - .ds/
     - .json
     - .fif
@@ -43,20 +43,3 @@
     task: optional
     acq: optional
     space: optional
-# Third group
-- suffixes:
-    - physio
-    - stim
-  extensions:
-    - .tsv.gz
-    - .json
-  entities:
-    sub: required
-    ses: optional
-    task: required
-    acq: optional
-    run: optional
-    proc: optional
-    split: optional
-    space: optional
-    recording: optional
diff --git a/bids-validator/schemas/entities.yaml b/bids-validator/schemas/entities.yaml
index bc04a1591..f1b32de0e 100644
--- a/bids-validator/schemas/entities.yaml
+++ b/bids-validator/schemas/entities.yaml
@@ -1,11 +1,13 @@
 ---
-sub:
+subject:
   name: Subject
+  entity: sub
   description: |
     A person or animal participating in the study.
   format: label
-ses:
+session:
   name: Session
+  entity: ses
   description: |
     A logical grouping of neuroimaging and behavioral data consistent across
     subjects.
@@ -20,116 +22,232 @@ ses:
     those can be grouped in one session.
     Defining multiple sessions is appropriate when several identical or similar
     data acquisitions are planned and performed on all -or most- subjects,
-    often in the case of some intervention between sessions (e.g., training).
+    often in the case of some intervention between sessions
+    (for example, training).
   format: label
 task:
   name: Task
+  entity: task
   format: label
   description: |
     Each task has a unique label that MUST only consist of letters and/or
     numbers (other characters, including spaces and underscores, are not
     allowed).
     Those labels MUST be consistent across subjects and sessions.
-acq:
+acquisition:
   name: Acquisition
+  entity: acq
   description: |
-    The OPTIONAL acq-<label> key/value pair corresponds to a custom label the
+    The `acq-<label>` key/value pair corresponds to a custom label the
     user MAY use to distinguish a different set of parameters used for
     acquiring the same modality.
     For example this should be used when a study includes two T1w images - one
     full brain low resolution and and one restricted field of view but high
     resolution.
     In such case two files could have the following names:
-    sub-01_acq-highres_T1w.nii.gz and sub-01_acq-lowres_T1w.nii.gz, however the
-    user is free to choose any other label than highres and lowres as long as
-    they are consistent across subjects and sessions.
-    In case different sequences are used to record the same modality (e.g. RARE
-    and FLASH for T1w) this field can also be used to make that distinction.
-    At what level of detail to make the distinction (e.g. just between RARE and
-    FLASH, or between RARE, FLASH, and FLASHsubsampled) remains at the
-    discretion of the researcher.
-  format: label
-ce:
+    `sub-01_acq-highres_T1w.nii.gz` and `sub-01_acq-lowres_T1w.nii.gz`, however
+    the user is free to choose any other label than highres and lowres as long
+    as they are consistent across subjects and sessions.
+    In case different sequences are used to record the same modality
+    (for example, RARE and FLASH for T1w)
+    this field can also be used to make that distinction.
+    At what level of detail to make the distinction (for example,
+    just between RARE and FLASH, or between RARE, FLASH, and FLASHsubsampled)
+    remains at the discretion of the researcher.
+  format: label
+ceagent:
   name: Contrast Enhancing Agent
+  entity: ce
   description: |
-    Similarly the OPTIONAL ce-<label> key/value can be used to distinguish
+    The `ce-<label>` key/value can be used to distinguish
     sequences using different contrast enhanced images.
     The label is the name of the contrast agent.
-    The key ContrastBolusIngredient MAY be also be added in the JSON file, with
-    the same label.
+    The key `ContrastBolusIngredient` MAY be also be added in the JSON file,
+    with the same label.
   format: label
-rec:
+reconstruction:
   name: Reconstruction
+  entity: rec
   description: |
-    Similarly the OPTIONAL rec-<label> key/value can be used to distinguish
+    The `rec-<label>` key/value can be used to distinguish
     different reconstruction algorithms (for example ones using motion
     correction).
   format: label
-dir:
+direction:
   name: Phase-Encoding Direction
+  entity: dir
   description: |
-    Similarly the OPTIONAL dir-<label> key/value can be used to distinguish
-    different phase-encoding directions.
+    The `dir-<label>` key/value can be set to an arbitrary alphanumeric label
+    (for example, `dir-LR` or `dir-AP`) to distinguish different phase-encoding
+    directions.
   format: label
 run:
   name: Run
+  entity: run
   description: |
     If several scans of the same modality are acquired they MUST be indexed
-    with a key-value pair: `_run-1`, `_run-2`, `_run-3` etc. (only integers
-    are allowed as run labels).
+    with a key-value pair: `_run-1`, `_run-2`, ..., `_run-<index>`
+    (only nonnegative integers are allowed for the `<index>`).
     When there is only one scan of a given type the run key MAY be omitted.
-    Please note that diffusion imaging data is stored elsewhere (see below).
   format: index
-mod:
+modality:
   name: Corresponding Modality
+  entity: mod
   description: |
-    In such cases the OPTIONAL `mod-<label>` key/value pair corresponds to
-    modality label for eg: T1w, inplaneT1, referenced by a defacemask image.
-    E.g., sub-01_mod-T1w_defacemask.nii.gz.
+    The `mod-<label>` key/value pair corresponds to modality label for defacing
+    masks, for example, T1w, inplaneT1, referenced by a defacemask image.
+    For example, `sub-01_mod-T1w_defacemask.nii.gz`.
   format: label
 echo:
   name: Echo
+  entity: echo
+  description: |
+    If files belonging to an entity-linked file collection are acquired at different
+    echo times, the `_echo-<index>` key/value pair MUST be used to distinguish
+    individual files.
+    This entity represents the `EchoTime` metadata field. Please note that the `<index>`
+    denotes the number/index (in the form of a nonnegative integer), not the
+    `EchoTime` value which needs to be stored in the field `EchoTime` of the separate
+    JSON file.
+  format: index
+flip:
+  name: Flip Angle
+  entity: flip
+  description: |
+    If files belonging to an entity-linked file collection are acquired at different
+    flip angles, the `_flip-<index>` key/value pair MUST be used to distinguish
+    individual files.
+    This entity represents the `FlipAngle` metadata field. Please note that the `<index>`
+    denotes the number/index (in the form of a nonnegative integer), not the `FlipAngle`
+    value which needs to be stored in the field `FlipAngle` of the separate JSON file.
+  format: index
+inv:
+  name: Inversion Time
+  entity: inv
   description: |
-    Multi-echo data MUST be split into one file per echo.
-    Each file shares the same name with the exception of the `_echo-<index>`
-    key/value.
+    If files belonging to an entity-linked file collection are acquired at different
+    inversion times, the `_inv-<index>` key/value pair MUST be used to distinguish
+    individual files.
+    This entity represents the `InversionTime` metadata field. Please note that the `<index>`
+    denotes the number/index (in the form of a nonnegative integer), not the `InversionTime`
+    value which needs to be stored in the field `InversionTime` of the separate JSON file.
   format: index
+mt:
+  name: Magnetization Transfer
+  entity: mt
+  description: |
+    If files belonging to an entity-linked file collection are acquired at different
+    magnetization transfer (MT) states, the `_mt-<label>` key/value pair MUST be used to
+    distinguish individual files.
+    This entity represents the `MTState` metadata field. Allowed label values for this
+    entity are `on` and `off`, for images acquired in presence and absence of an MT pulse,
+    respectively.
+  format: label
+part:
+  name: Part
+  entity: part
+  description: |
+    This entity is used to indicate which component of the complex
+    representation of the MRI signal is represented in voxel data.
+    The `part-<label>` key/value pair is associated with the DICOM tag
+    `0008,9208`.
+    Allowed label values for this entity are `phase`, `mag`, `real` and `imag`,
+    which are typically used in `part-mag`/`part-phase` or
+    `part-real`/`part-imag` pairs of files.
+
+    Phase images MAY be in radians or in arbitrary units.
+    The sidecar JSON file MUST include the units of the `phase` image.
+    The possible options are `rad` or `arbitrary`.
+
+    When there is only a magnitude image of a given type, the `part` key MAY be
+    omitted.
+  format: label
 recording:
   name: Recording
+  entity: recording
   description: |
     More than one continuous recording file can be included (with different
     sampling frequencies).
     In such case use different labels.
     For example: `_recording-contrast`, `_recording-saturation`.
   format: label
-proc:
+processing:
   name: Processed (on device)
+  entity: proc
   description: |
     The proc label is analogous to rec for MR and denotes a variant of a file
     that was a result of particular processing performed on the device.
     This is useful for files produced in particular by Elekta’s MaxFilter
-    (e.g. sss, tsss, trans, quat, mc, etc.), which some installations impose to
-    be run on raw data because of active shielding software corrections before
-    the MEG data can actually be exploited.
+    (for example, sss, tsss, trans, quat or mc),
+    which some installations impose to be run on raw data because of active
+    shielding software corrections before the MEG data can actually be
+    exploited.
   format: label
 space:
   name: Space
+  entity: space
   description: |
-    The optional space label (`*[_space-<label>]_electrodes.tsv`) can be used
-    to indicate the way in which electrode positions are interpreted.
+    The space entity can be used to indicate
+    the way in which electrode positions are interpreted
+    (for EEG/MEG/iEEG data) or
+    the spatial reference to which a file has been aligned (for MRI data).
     The space label needs to be taken from the list in Appendix VIII.
+
+    For EEG/MEG/iEEG data, this entity can be applied to raw data, but
+    for other data types, it is restricted to derivative data.
   format: label
 split:
   name: Split
+  entity: split
   description: |
     In the case of long data recordings that exceed a file size of 2Gb, the
     .fif files are conventionally split into multiple parts.
     Each of these files has an internal pointer to the next file.
     This is important when renaming these split recordings to the BIDS
     convention.
+
     Instead of a simple renaming, files should be read in and saved under their
     new names with dedicated tools like MNE, which will ensure that not only
     the file names, but also the internal file pointers will be updated.
     It is RECOMMENDED that .fif files with multiple parts use the
     `split-<index>` entity to indicate each part.
   format: index
+res:
+  name: Resolution
+  entity: res
+  description: |
+    Resolution of regularly sampled N-dimensional data.
+    MUST have a corresponding `Resolution` metadata field to provide
+    interpretation.
+
+    This entity is only applicable to derivative data.
+  format: label
+den:
+  name: Density
+  entity: den
+  description: |
+    Density of non-parametric surfaces.
+    MUST have a corresponding `Density` metadata field to provide
+    interpretation.
+
+    This entity is only applicable to derivative data.
+  format: label
+label:
+  name: Label
+  entity: label
+  description: |
+    Tissue-type label, following a prescribed vocabulary.
+    Applies to binary masks and probabilistic/partial volume segmentations
+    that describe a single tissue type.
+
+    This entity is only applicable to derivative data.
+  format: label
+desc:
+  name: Description
+  entity: desc
+  description: |
+    When necessary to distinguish two files that do not otherwise have a
+    distinguishing entity, the `_desc-<label>` keyword-value SHOULD be used.
+
+    This entity is only applicable to derivative data.
+  format: label
diff --git a/bids-validator/schemas/index.js b/bids-validator/schemas/index.js
index 49a490b34..50e5d045d 100644
--- a/bids-validator/schemas/index.js
+++ b/bids-validator/schemas/index.js
@@ -37,8 +37,9 @@ const generateRegex = (pythonRegex = false) => {
         if (entity === 'sub' || entity === 'ses') {
           return
         }
+        let format = regex[Object.values(entities).find(elem => elem.entity === entity).format]
         file_regex = file_regex.concat(
-          `(?${P}<${entity}>_${entity}-${regex[entities[entity].format]})${
+          `(?${P}<${entity}>_${entity}-${format})${
             regex[datatype_yaml.entities[entity]]
           }`,
         )
@@ -58,4 +59,3 @@ const generateRegex = (pythonRegex = false) => {
 }
 
 generateRegex()
-generateRegex(true)
diff --git a/bids-validator/schemas/json/bold.json b/bids-validator/schemas/json/bold.json
new file mode 100644
index 000000000..039d56215
--- /dev/null
+++ b/bids-validator/schemas/json/bold.json
@@ -0,0 +1,42 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "type": "object",
+  "properties": {
+    "CogAtlasID": {
+      "type": "string"
+    },
+    "CogPOID": {
+      "type": "string"
+    },
+    "EchoTime": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "EffectiveEchoSpacing": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "PhaseEncodingDirection": {
+      "type": "string",
+      "enum": ["i", "j", "k", "i-", "j-", "k-"]
+    },
+    "RepetitionTime": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "SliceEncodingDirection": {
+      "type": "string",
+      "enum": ["i", "j", "k", "i-", "j-", "k-"]
+    },
+    "SliceTiming": {
+      "type": "array",
+      "items": {
+        "type": "number",
+        "minimum": 0
+      }
+    },
+    "TaskName": {
+      "type": "string"
+    }
+  }
+}
diff --git a/bids-validator/schemas/json/common_definitions.json b/bids-validator/schemas/json/common_definitions.json
new file mode 100644
index 000000000..7cd200eb5
--- /dev/null
+++ b/bids-validator/schemas/json/common_definitions.json
@@ -0,0 +1,62 @@
+{
+  "$id": "common_definitions.json",
+  "definitions": {
+    "CogAtlasID": { "type": "string" },
+    "CogPOID": { "type": "string" },
+    "CoordUnits": { "type": "string", "enum": ["m", "mm", "cm", "n/a"] },
+    "DeviceSerialNumber": { "type": "string" },
+    "ECGChannelCount": { "type": "integer", "minimum": 0 },
+    "EEGChannelCount": { "type": "integer", "minimum": 0 },
+    "EMGChannelCount": { "type": "integer", "minimum": 0 },
+    "EOGChannelCount": { "type": "integer", "minimum": 0 },
+    "EpochLength": { "type": "number", "minimum": 0 },
+    "HardwareFilters": {
+      "anyOf": [
+        { "type": "object", "additionalProperties": { "type": "object" } },
+        { "type": "string", "pattern": "^n/a$" }
+      ]
+    },
+    "InstitutionAddress": { "type": "string" },
+    "InstitutionName": { "type": "string" },
+    "Instructions": { "type": "string" },
+    "LandmarkCoordinates": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "array", 
+        "items": {
+          "type": "number"
+        },
+        "minItems": 3,
+        "maxItems": 3
+      }
+    },
+    "Manufacturer": { "type": "string", "minLength": 1 },
+    "MiscChannelCount": { "type": "integer", "minimum": 0 },
+    "PowerLineFrequency": {
+      "anyOf": [
+        { "type": "number", "exclusiveMinimum": 0 },
+        { "type": "string", "pattern": "^n/a$" }
+      ]
+    },
+    "RecordingDuration": { "type": "number" },
+    "RecordingType": {
+      "type": "string",
+      "enum": [
+        "continuous",
+        "epoched",
+        "discontinuous" 
+      ]
+    },
+    "SamplingFrequency": { "type": "number" },
+    "SoftwareFilters": {
+      "anyOf": [
+        { "type": "object", "additionalProperties": { "type": "object" } },
+        { "type": "string", "pattern": "^n/a$" }
+      ]
+    },
+    "SoftwareVersions": { "type": "string" },
+    "TaskDescription": { "type": "string" },
+    "TaskName": { "type": "string", "minLength": 1 },
+    "TriggerChannelCount": { "type": "integer", "minimum": 0 }
+  }
+}
diff --git a/bids-validator/schemas/json/coordsystem_eeg.json b/bids-validator/schemas/json/coordsystem_eeg.json
new file mode 100644
index 000000000..fe7ede356
--- /dev/null
+++ b/bids-validator/schemas/json/coordsystem_eeg.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "properties": {
+    "IntendedFor": { "type": "string", "minLength": 1 },
+    "FiducialsDescription": { "type": "string", "minLength": 1 },
+    "FiducialsCoordinates": { "$ref": "common_definitions.json#/definitions/LandmarkCoordinates" },
+    "FiducialsCoordinateSystem": { "type": "string", "minLength": 1 },
+    "FiducialsCoordinateSystemDescription": { "type": "string" },
+    "FiducialsCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "EEGCoordinateSystem": { "type": "string", "minLength": 1 },
+    "EEGCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "EEGCoordinateSystemDescription": { "type": "string" },
+    "AnatomicalLandmarkCoordinates": { "$ref": "common_definitions.json#/definitions/LandmarkCoordinates" },
+    "AnatomicalLandmarkCoordinateSystem": { "type": "string", "minLength": 1 },
+    "AnatomicalLandmarkCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "AnatomicalLandmarkCoordinateSystemDescription": { "type": "string" }
+  },
+  "required": ["EEGCoordinateSystem", "EEGCoordinateUnits"],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/coordsystem_ieeg.json b/bids-validator/schemas/json/coordsystem_ieeg.json
new file mode 100644
index 000000000..6a1581bdd
--- /dev/null
+++ b/bids-validator/schemas/json/coordsystem_ieeg.json
@@ -0,0 +1,13 @@
+{
+  "type": "object",
+  "properties": {
+    "iEEGCoordinateSystem": { "type": "string", "minLength": 1 },
+    "iEEGCoordinateUnits":  { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "iEEGCoordinateSystemDescription": { "type": "string", "minLength": 1 },
+    "iEEGCoordinateProcessingDescription": { "type": "string", "minLength": 1 },
+    "iEEGCoordinateProcessingReference": { "type": "string", "minLength": 1 },
+    "IntendedFor": { "type": "string", "minLength": 1 }
+  },
+  "required": ["iEEGCoordinateSystem", "iEEGCoordinateUnits"],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/coordsystem_meg.json b/bids-validator/schemas/json/coordsystem_meg.json
new file mode 100644
index 000000000..9d71437be
--- /dev/null
+++ b/bids-validator/schemas/json/coordsystem_meg.json
@@ -0,0 +1,38 @@
+{
+  "type": "object",
+  "properties": {
+    "MEGCoordinateSystem": { "type": "string", "minLength": 1 },
+    "MEGCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "MEGCoordinateSystemDescription": { "type": "string" },
+    "EEGCoordinateSystem": { "type": "string", "minLength": 1 },
+    "EEGCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "EEGCoordinateSystemDescription": { "type": "string" },
+    "IntendedFor": {
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          }
+        },
+        { "type": "string", "minLength": 1 }
+      ]
+    },
+    "FiducialsDescription": { "type": "string", "minLength": 1 },
+    "HeadCoilCoordinates": { "$ref": "common_definitions.json#/definitions/LandmarkCoordinates" },
+    "HeadCoilCoordinateSystem": { "type": "string", "minLength": 1 },
+    "HeadCoilCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "HeadCoilCoordinateSystemDescription": { "type": "string" },
+    "AnatomicalLandmarkCoordinates": { "$ref": "common_definitions.json#/definitions/LandmarkCoordinates" },
+    "AnatomicalLandmarkCoordinateSystem": { "type": "string", "minLength": 1 },
+    "AnatomicalLandmarkCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "AnatomicalLandmarkCoordinateSystemDescription": { "type": "string" },
+    "DigitizedHeadPoints": { "type": "string" },
+    "DigitizedHeadPointsCoordinateSystem": { "type": "string" },
+    "DigitizedHeadPointsCoordinateUnits": { "$ref": "common_definitions.json#/definitions/CoordUnits" },
+    "DigitizedHeadPointsCoordinateSystemDescription": { "type": "string" }
+  },
+  "required": ["MEGCoordinateSystem", "MEGCoordinateUnits"],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/data_dictionary.json b/bids-validator/schemas/json/data_dictionary.json
new file mode 100644
index 000000000..0712d03a9
--- /dev/null
+++ b/bids-validator/schemas/json/data_dictionary.json
@@ -0,0 +1,42 @@
+{
+  "type": "object",
+  "patternProperties": {
+    "^.+$": {
+      "type": "object",
+      "title": "Column",
+      "description": "Column of a corresponding tabular file.",
+      "properties": {
+        "LongName": {
+          "title": "LongName",
+          "description": " Long (unabbreviated) name of column.",
+          "type": "string"
+        },
+        "Description": {
+          "title": "Description",
+          "description": "Description of the column.",
+          "type": "string"
+        },
+        "Units": {
+          "title": "Units",
+          "description": "Measurement units.",
+          "type": "string"
+        },
+        "Levels": {
+          "type": "object",
+          "title": "Levels",
+          "description": "For  categorical variables: a dictionary of possible values (keys) and their descriptions (values).",
+          "patternProperties": {
+            "^.+$": {
+              "type": "string"
+            }
+          }
+        },
+        "TermURL": {
+          "title": "TermURL",
+          "description": "URL pointing to a formal definition in an ontology available on the web.",
+          "type": "string"
+        }
+      }
+    }
+  }
+}
diff --git a/bids-validator/schemas/json/dataset_description.json b/bids-validator/schemas/json/dataset_description.json
new file mode 100644
index 000000000..c6b9b163d
--- /dev/null
+++ b/bids-validator/schemas/json/dataset_description.json
@@ -0,0 +1,74 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$id": "http://example.com/example.json",
+  "properties": {
+    "Name": {
+      "type": "string"
+    },
+    "BIDSVersion": {
+      "type": "string"
+    },
+    "HEDVersion": {
+      "type": "string"
+    },
+    "DatasetType": {
+      "type": "string",
+      "enum": ["raw", "derivative"]
+    },
+    "License": {
+      "type": "string"
+    },
+    "Authors": {
+      "items": {
+        "type": "string"
+      },
+      "type": "array"
+    },
+    "Acknowledgements": {
+      "type": "string"
+    },
+    "HowToAcknowledge": {
+      "type": "string"
+    },
+    "Funding": {
+      "items": {
+        "type": "string"
+      },
+      "type": "array"
+    },
+    "EthicsApprovals": {
+      "items": {
+        "type": "string"
+      },
+      "type": "array"
+    },
+    "ReferencesAndLinks": {
+      "items": {
+        "type": "string"
+      },
+      "type": "array"
+    },
+    "DatasetDOI": {
+      "type": "string"
+    },
+    "Genetics": {
+      "type": "object",
+      "properties": {
+        "Database": {
+          "type": "string"
+        },
+        "Dataset": {
+          "type": "string"
+        },
+        "Descriptors": {
+          "items": {
+            "type": "string"
+          },
+          "type": ["array", "string"]
+        }
+      }
+    }
+  },
+  "required": ["Name", "BIDSVersion"],
+  "type": "object"
+}
diff --git a/bids-validator/schemas/json/eeg.json b/bids-validator/schemas/json/eeg.json
new file mode 100644
index 000000000..261bb62d7
--- /dev/null
+++ b/bids-validator/schemas/json/eeg.json
@@ -0,0 +1,45 @@
+{
+  "type": "object",
+  "properties": {
+    "TaskName": { "$ref": "common_definitions.json#/definitions/TaskName" },
+    "TaskDescription": { "$ref": "common_definitions.json#/definitions/TaskDescription" },
+    "Instructions": { "$ref": "common_definitions.json#/definitions/Instructions" },
+    "CogAtlasID": { "$ref": "common_definitions.json#/definitions/CogAtlasID" },
+    "CogPOID": { "$ref": "common_definitions.json#/definitions/CogPOID" },
+    "InstitutionName": { "$ref": "common_definitions.json#/definitions/InstitutionName" },
+    "InstitutionalDepartmentName": { "type": "string" },
+    "InstitutionAddress": { "$ref": "common_definitions.json#/definitions/InstitutionAddress" },
+    "Manufacturer": { "$ref": "common_definitions.json#/definitions/Manufacturer" },
+    "ManufacturersModelName": { "type": "string", "minLength": 1 },
+    "DeviceSerialNumber": { "$ref": "common_definitions.json#/definitions/DeviceSerialNumber" },
+    "SoftwareVersions": { "$ref": "common_definitions.json#/definitions/SoftwareVersions" },
+    "PowerLineFrequency": { "$ref": "common_definitions.json#/definitions/PowerLineFrequency" },
+    "SamplingFrequency": { "$ref": "common_definitions.json#/definitions/SamplingFrequency" },
+    "EEGChannelCount": { "$ref": "common_definitions.json#/definitions/EEGChannelCount" },
+    "EOGChannelCount": { "$ref": "common_definitions.json#/definitions/EOGChannelCount" },
+    "ECGChannelCount": { "$ref": "common_definitions.json#/definitions/ECGChannelCount" },
+    "EMGChannelCount": { "$ref": "common_definitions.json#/definitions/EMGChannelCount" },
+    "MiscChannelCount": { "$ref": "common_definitions.json#/definitions/MiscChannelCount" },
+    "TriggerChannelCount": { "$ref": "common_definitions.json#/definitions/TriggerChannelCount" },
+    "EEGPlacementScheme": { "type": "string" },
+    "EEGReference": { "type": "string" },
+    "EEGGround": { "type": "string" },
+    "CapManufacturer": { "type": "string" },
+    "CapManufacturersModelName": { "type": "string" },
+    "HeadCircumference": { "type": "number", "exclusiveMinimum": 0 },
+    "HardwareFilters": { "$ref": "common_definitions.json#/definitions/HardwareFilters" },
+    "SoftwareFilters": { "$ref": "common_definitions.json#/definitions/SoftwareFilters" },
+    "RecordingDuration": { "$ref": "common_definitions.json#/definitions/RecordingDuration" },
+    "RecordingType": { "$ref": "common_definitions.json#/definitions/RecordingType" },
+    "EpochLength": { "$ref": "common_definitions.json#/definitions/EpochLength" },
+    "SubjectArtefactDescription": { "type": "string" }
+  },
+  "required": [
+    "TaskName",
+    "SamplingFrequency",
+    "SoftwareFilters",
+    "EEGReference",
+    "PowerLineFrequency"
+  ],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/genetic_info.json b/bids-validator/schemas/json/genetic_info.json
new file mode 100644
index 000000000..2e59d454a
--- /dev/null
+++ b/bids-validator/schemas/json/genetic_info.json
@@ -0,0 +1,61 @@
+{
+  "type": "object",
+  "definitions": {
+    "GeneticLevelEnum": {
+      "type": "string",
+      "enum": [
+        "Genetic",
+        "Genomic",
+        "Epigenomic",
+        "Transcriptomic",
+        "Metabolomic",
+        "Proteomic"
+      ]
+    }
+  },
+  "properties": {
+    "GeneticLevel": {
+      "anyof": [
+        {
+          "type": "array",
+          "items": {"$ref": "#/definitions/GeneticLevelEnum"}
+        },
+        { "$ref": "#/definitions/GeneticLevelEnum" }
+      ]
+    },
+    "AnalyticalApproach": {
+      "items": {
+        "type": "string"
+      },
+      "type": ["array", "string"]
+    },
+    "SampleOrigin": {
+      "type": "string",
+      "enum": [
+        "blood",
+        "saliva",
+        "brain",
+        "csf",
+        "breast milk",
+        "bile",
+        "amniotic fluid",
+        "other biospecimen"
+      ]
+    },
+    "TissueOrigin": {
+      "type": "string",
+      "enum": [
+        "gray matter",
+        "white matter",
+        "csf",
+        "meninges",
+        "macrovascular",
+        "microvascular"
+      ]
+    },
+    "BrainLocation": { "type": "string" },
+    "CellType": { "type": "string" }
+  },
+  "required": ["GeneticLevel", "SampleOrigin"],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/ieeg.json b/bids-validator/schemas/json/ieeg.json
new file mode 100644
index 000000000..d2081b4bb
--- /dev/null
+++ b/bids-validator/schemas/json/ieeg.json
@@ -0,0 +1,49 @@
+{
+  "type": "object",
+  "properties": {
+    "TaskName": { "$ref": "common_definitions.json#/definitions/TaskName" },
+    "SamplingFrequency": { "$ref": "common_definitions.json#/definitions/SamplingFrequency" },
+    "PowerLineFrequency": { "$ref": "common_definitions.json#/definitions/PowerLineFrequency" },
+    "DCOffsetCorrection": { "type": "string", "minLength": 1 },
+    "SoftwareFilters": { "$ref": "common_definitions.json#/definitions/SoftwareFilters" },
+    "HardwareFilters": { "$ref": "common_definitions.json#/definitions/HardwareFilters" },
+    "Manufacturer": { "$ref": "common_definitions.json#/definitions/Manufacturer" },
+    "ManufacturersModelName": { "type": "string" },
+    "TaskDescription": { "$ref": "common_definitions.json#/definitions/TaskDescription" },
+    "Instructions": { "$ref": "common_definitions.json#/definitions/Instructions" },
+    "CogAtlasID": { "$ref": "common_definitions.json#/definitions/CogAtlasID" },
+    "CogPOID": { "$ref": "common_definitions.json#/definitions/CogPOID" },
+    "InstitutionName": { "$ref": "common_definitions.json#/definitions/InstitutionName" },
+    "InstitutionAddress": { "$ref": "common_definitions.json#/definitions/InstitutionAddress" },
+    "DeviceSerialNumber": { "$ref": "common_definitions.json#/definitions/DeviceSerialNumber" },
+    "ECOGChannelCount": { "type": "integer", "minimum": 0 },
+    "SEEGChannelCount": { "type": "integer", "minimum": 0 },
+    "EEGChannelCount": { "$ref": "common_definitions.json#/definitions/EEGChannelCount" },
+    "EOGChannelCount": { "$ref": "common_definitions.json#/definitions/EOGChannelCount" },
+    "ECGChannelCount": { "$ref": "common_definitions.json#/definitions/ECGChannelCount" },
+    "EMGChannelCount": { "$ref": "common_definitions.json#/definitions/EMGChannelCount" },
+    "MiscChannelCount": { "$ref": "common_definitions.json#/definitions/MiscChannelCount" },
+    "TriggerChannelCount": { "$ref": "common_definitions.json#/definitions/TriggerChannelCount" },
+    "RecordingDuration": { "$ref": "common_definitions.json#/definitions/RecordingDuration" },
+    "RecordingType": { "$ref": "common_definitions.json#/definitions/RecordingType" },
+    "EpochLength": { "$ref": "common_definitions.json#/definitions/EpochLength" },
+    "SubjectArtefactDescription": { "type": "string" },
+    "SoftwareVersions": { "$ref": "common_definitions.json#/definitions/SoftwareVersions" },
+    "iEEGReference": { "type": "string" },
+    "ElectrodeManufacturer": { "type": "string" },
+    "ElectrodeManufacturersModelName": { "type": "string" },
+    "iEEGGround": { "type": "string" },
+    "iEEGPlacementScheme": { "type": "string" },
+    "iEEGElectrodeGroups": { "type": "string" },
+    "ElectricalStimulation": { "type": "boolean" },
+    "ElectricalStimulationParameters": { "type": "string" }
+  },
+  "required": [
+    "TaskName",
+    "SamplingFrequency",
+    "PowerLineFrequency",
+    "SoftwareFilters",
+    "iEEGReference"
+  ],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/meg.json b/bids-validator/schemas/json/meg.json
new file mode 100644
index 000000000..6297fe985
--- /dev/null
+++ b/bids-validator/schemas/json/meg.json
@@ -0,0 +1,75 @@
+{
+  "type": "object",
+  "properties": {
+    "TaskName": { "$ref": "common_definitions.json#/definitions/TaskName" },
+    "TaskDescription": { "$ref": "common_definitions.json#/definitions/TaskDescription" },
+    "Instructions": { "$ref": "common_definitions.json#/definitions/Instructions" },
+    "CogAtlasID": { "$ref": "common_definitions.json#/definitions/CogAtlasID" },
+    "CogPOID": { "$ref": "common_definitions.json#/definitions/CogPOID" },
+    "InstitutionName": { "$ref": "common_definitions.json#/definitions/InstitutionName" },
+    "InstitutionalDepartmentName": { "type": "string" },
+    "InstitutionAddress": { "$ref": "common_definitions.json#/definitions/InstitutionAddress" },
+    "Manufacturer": { "$ref": "common_definitions.json#/definitions/Manufacturer" },
+    "ManufacturersModelName": { "type": "string", "minLength": 1 },
+    "DeviceSerialNumber": { "$ref": "common_definitions.json#/definitions/DeviceSerialNumber" },
+    "SoftwareVersions": { "$ref": "common_definitions.json#/definitions/SoftwareVersions" },
+    "PowerLineFrequency": { "$ref": "common_definitions.json#/definitions/PowerLineFrequency" },
+    "SamplingFrequency": { "$ref": "common_definitions.json#/definitions/SamplingFrequency" },
+    "MEGChannelCount": { "type": "integer", "minimum": 0 },
+    "MEGREFChannelCount": { "type": "integer", "minimum": 0 },
+    "EEGChannelCount": { "$ref": "common_definitions.json#/definitions/EEGChannelCount" },
+    "ECOGChannelCount": { "type": "integer", "minimum": 0 },
+    "SEEGChannelCount": { "type": "integer", "minimum": 0 },
+    "EOGChannelCount": { "$ref": "common_definitions.json#/definitions/EOGChannelCount" },
+    "ECGChannelCount": { "$ref": "common_definitions.json#/definitions/ECGChannelCount" },
+    "EMGChannelCount": { "$ref": "common_definitions.json#/definitions/EMGChannelCount" },
+    "MiscChannelCount": { "$ref": "common_definitions.json#/definitions/MiscChannelCount" },
+    "TriggerChannelCount": { "$ref": "common_definitions.json#/definitions/TriggerChannelCount" },
+    "EEGPlacementScheme": { "type": "string" },
+    "EEGReference": { "type": "string" },
+    "CapManufacturer": { "type": "string" },
+    "CapManufacturersModelName": { "type": "string" },
+    "DewarPosition": { "type": "string" },
+    "HardwareFilters": { "$ref": "common_definitions.json#/definitions/HardwareFilters" },
+    "SoftwareFilters": { "$ref": "common_definitions.json#/definitions/SoftwareFilters" },
+    "RecordingDuration": { "$ref": "common_definitions.json#/definitions/RecordingDuration" },
+    "RecordingType": { "$ref": "common_definitions.json#/definitions/RecordingType" },
+    "EpochLength": { "$ref": "common_definitions.json#/definitions/EpochLength" },
+    "ContinuousHeadLocalization": { "type": "boolean" },
+    "HeadCoilFrequency": {
+      "anyOf": [
+        { "type": "number" },
+        {
+          "type": "array",
+          "items": { "type": "number" }
+        }
+      ]
+    },
+    "AssociatedEmptyRoom": {
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          }
+        },
+        { "type": "string", "minLength": 1 }
+      ]
+    },
+    "MaxMovement": { "type": "number" },
+    "SubjectArtefactDescription": { "type": "string" },
+    "DigitizedLandmarks": { "type": "boolean" },
+    "DigitizedHeadPoints": { "type": "boolean" }
+  },
+  "required": [
+    "TaskName",
+    "SamplingFrequency",
+    "PowerLineFrequency",
+    "DewarPosition",
+    "SoftwareFilters",
+    "DigitizedLandmarks",
+    "DigitizedHeadPoints"
+  ],
+  "additionalProperties": false
+}
diff --git a/bids-validator/schemas/json/physio.json b/bids-validator/schemas/json/physio.json
new file mode 100644
index 000000000..a7f2db37b
--- /dev/null
+++ b/bids-validator/schemas/json/physio.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "properties": {
+    "SamplingFrequency": { "type": "number", "exclusiveMinimum": 0 },
+    "StartTime": { "type": "number" },
+    "Columns": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      }
+    }
+  },
+  "required": [
+    "SamplingFrequency",
+    "StartTime",
+    "Columns"
+  ]
+}
+
diff --git a/bids-validator/schemas/python_regex.json b/bids-validator/schemas/python_regex.json
index 09d0b1348..120ad3c16 100644
--- a/bids-validator/schemas/python_regex.json
+++ b/bids-validator/schemas/python_regex.json
@@ -1,39 +1,35 @@
 {
   "anat": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?_(?P<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?P<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<mod>_mod-[a-zA-Z0-9]+)?_(?P<suffix>defacemask)(?P<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<part>_part-[a-zA-Z0-9]+)?_(?P<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?P<run>_run-[0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<mod>_mod-[a-zA-Z0-9]+)?_(?P<suffix>defacemask)(?P<ext>.nii.gz|.nii|.json)$"
   ],
   "beh": [
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>stim|physio)(?P<ext>.tsv.gz|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>events|beh)(?P<ext>.tsv|.json)$"
   ],
   "dwi": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>dwi)(?P<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>sbref)(?P<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<part>_part-[a-zA-Z0-9]+)?_(?P<suffix>dwi)(?P<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<part>_part-[a-zA-Z0-9]+)?_(?P<suffix>sbref)(?P<ext>.nii.gz|.nii|.json)$"
   ],
   "eeg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>eeg)(?P<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>eeg)(?P<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$"
   ],
   "fmap": [
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>phasediff|phase1|phase2|magnitude1|magnitude2|magnitude|fieldmap)(?P<ext>.nii.gz|.nii|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)(?P<run>_run-[0-9]+)?_(?P<suffix>epi)(?P<ext>.nii.gz|.nii|.json)$"
   ],
   "func": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<echo>_echo-[0-9]+)?_(?P<suffix>bold|cbv|phase|sbref)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<echo>_echo-[0-9]+)?(?P<part>_part-[a-zA-Z0-9]+)?_(?P<suffix>bold|cbv|sbref)(?P<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<echo>_echo-[0-9]+)?_(?P<suffix>phase)(?P<ext>.nii.gz|.nii|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<ce>_ce-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<dir>_dir-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<echo>_echo-[0-9]+)?_(?P<suffix>events)(?P<ext>.tsv|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<rec>_rec-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
   ],
   "ieeg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>ieeg)(?P<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?_(?P<suffix>ieeg)(?P<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$"
   ],
   "meg": [
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<proc>_proc-[a-zA-Z0-9]+)?(?P<split>_split-[0-9]+)?_(?P<suffix>meg)(?P<ext>/|.ds/|.json|.fif|.sqd|.con|.raw|.ave|.mrk|.kdf|.mhd)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?_(?P<suffix>headshape)(?P<ext>.pos|.txt)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?_(?P<suffix>markers)(?P<ext>.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<run>_run-[0-9]+)?(?P<proc>_proc-[a-zA-Z0-9]+)?(?P<split>_split-[0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?(?P<recording>_recording-[a-zA-Z0-9]+)?_(?P<suffix>physio|stim)(?P<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?P<task>_task-[a-zA-Z0-9]+)?(?P<acq>_acq-[a-zA-Z0-9]+)?(?P<space>_space-[a-zA-Z0-9]+)?_(?P<suffix>markers)(?P<ext>.json)$"
   ]
-}
+}
\ No newline at end of file
diff --git a/bids-validator/schemas/regex.json b/bids-validator/schemas/regex.json
index 78b36e078..7f3c946e3 100644
--- a/bids-validator/schemas/regex.json
+++ b/bids-validator/schemas/regex.json
@@ -1,39 +1,35 @@
 {
   "anat": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?_(?<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<mod>_mod-[a-zA-Z0-9]+)?_(?<suffix>defacemask)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<mod>_mod-[a-zA-Z0-9]+)?_(?<suffix>defacemask)(?<ext>.nii.gz|.nii|.json)$"
   ],
   "beh": [
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>stim|physio)(?<ext>.tsv.gz|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>events|beh)(?<ext>.tsv|.json)$"
   ],
   "dwi": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>dwi)(?<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>sbref)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>dwi)(?<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>sbref)(?<ext>.nii.gz|.nii|.json)$"
   ],
   "eeg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>eeg)(?<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>eeg)(?<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$"
   ],
   "fmap": [
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>phasediff|phase1|phase2|magnitude1|magnitude2|magnitude|fieldmap)(?<ext>.nii.gz|.nii|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)(?<run>_run-[0-9]+)?_(?<suffix>epi)(?<ext>.nii.gz|.nii|.json)$"
   ],
   "func": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>bold|cbv|phase|sbref)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>bold|cbv|sbref)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>phase)(?<ext>.nii.gz|.nii|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>events)(?<ext>.tsv|.json)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
   ],
   "ieeg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>ieeg)(?<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>ieeg)(?<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$"
   ],
   "meg": [
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<proc>_proc-[a-zA-Z0-9]+)?(?<split>_split-[0-9]+)?_(?<suffix>meg)(?<ext>/|.ds/|.json|.fif|.sqd|.con|.raw|.ave|.mrk|.kdf|.mhd)$",
     "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>headshape)(?<ext>.pos|.txt)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>markers)(?<ext>.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<proc>_proc-[a-zA-Z0-9]+)?(?<split>_split-[0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>markers)(?<ext>.json)$"
   ]
-}
+}
\ No newline at end of file

From 7a649ba72d9babc529f6de0d5e8953bd1ff8c3f9 Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Tue, 2 Feb 2021 17:16:51 -0600
Subject: [PATCH 3/3] copy over latest schema files from spec and update
 index.js to match new format

---
 bids-validator/schemas/datatypes/anat.yaml | 167 ++++++++++++++++++---
 bids-validator/schemas/datatypes/beh.yaml  |  12 +-
 bids-validator/schemas/datatypes/dwi.yaml  |  16 +-
 bids-validator/schemas/datatypes/eeg.yaml  |  54 ++++++-
 bids-validator/schemas/datatypes/fmap.yaml |  50 +++++-
 bids-validator/schemas/datatypes/func.yaml |  44 +++---
 bids-validator/schemas/datatypes/ieeg.yaml |  54 ++++++-
 bids-validator/schemas/datatypes/meg.yaml  |  68 +++++++--
 bids-validator/schemas/datatypes/perf.yaml |  40 +++++
 bids-validator/schemas/entities.yaml       |  15 +-
 bids-validator/schemas/index.js            |   7 +-
 bids-validator/schemas/modalities.yaml     |   1 +
 bids-validator/schemas/regex.json          |  57 ++++---
 13 files changed, 476 insertions(+), 109 deletions(-)
 create mode 100644 bids-validator/schemas/datatypes/perf.yaml

diff --git a/bids-validator/schemas/datatypes/anat.yaml b/bids-validator/schemas/datatypes/anat.yaml
index e0b8bad9f..764f26cb2 100644
--- a/bids-validator/schemas/datatypes/anat.yaml
+++ b/bids-validator/schemas/datatypes/anat.yaml
@@ -3,31 +3,58 @@
 - suffixes:
     - T1w
     - T2w
-    - T1rho
-    - T1map
-    - T2map
-    - T2star
+    - PDw
+    - T2starw
     - FLAIR
-    - FLASH
-    - PD
-    - PDmap
-    - PDT2
     - inplaneT1
     - inplaneT2
+    - PDT2
     - angio
   extensions:
     - .nii.gz
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     run: optional
-    acq: optional
-    ce: optional
-    rec: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
     part: optional
 # Second group
+- suffixes:
+    - T1map
+    - T2map
+    - T2starmap
+    - R1map
+    - R2map
+    - R2starmap
+    - PDmap
+    - MTRmap
+    - MTsat
+    - UNIT1
+    - T1rho
+    - MWFmap
+    - MTVmap
+    - PDT2map
+    - Chimap
+    - TB1map
+    - RB1map
+    - S0map
+    - M0map
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+# Third group
 - suffixes:
     - defacemask
   extensions:
@@ -35,10 +62,112 @@
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     run: optional
-    acq: optional
-    ce: optional
-    rec: optional
-    mod: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    modality: optional
+# Fourth group
+- suffixes:
+    - MESE
+    - MEGRE
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    echo: required
+    part: optional
+# Fifth group
+- suffixes:
+    - VFA
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    flip: required
+    part: optional
+# Sixth group
+- suffixes:
+    - IRT1
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    inversion: required
+    part: optional
+# Seventh group
+- suffixes:
+    - MP2RAGE
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    echo: optional
+    flip: required
+    inversion: required
+    part: optional
+# Eighth group
+- suffixes:
+    - MPM
+    - MTS
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    echo: optional
+    flip: required
+    mtransfer: required
+    part: optional
+# Nineth group
+- suffixes:
+    - MTR
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    mtransfer: required
+    part: optional
diff --git a/bids-validator/schemas/datatypes/beh.yaml b/bids-validator/schemas/datatypes/beh.yaml
index 536e88321..d9de3cd0d 100644
--- a/bids-validator/schemas/datatypes/beh.yaml
+++ b/bids-validator/schemas/datatypes/beh.yaml
@@ -7,10 +7,10 @@
     - .tsv.gz
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
+    acquisition: optional
     run: optional
     recording: optional
 # Second group
@@ -21,8 +21,8 @@
     - .tsv
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
+    acquisition: optional
     run: optional
diff --git a/bids-validator/schemas/datatypes/dwi.yaml b/bids-validator/schemas/datatypes/dwi.yaml
index 291db298e..8d0fbb931 100644
--- a/bids-validator/schemas/datatypes/dwi.yaml
+++ b/bids-validator/schemas/datatypes/dwi.yaml
@@ -9,10 +9,10 @@
     - .bvec
     - .bval
   entities:
-    sub: required
-    ses: optional
-    acq: optional
-    dir: optional
+    subject: required
+    session: optional
+    acquisition: optional
+    direction: optional
     run: optional
     part: optional
 # Second group
@@ -23,9 +23,9 @@
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
-    acq: optional
-    dir: optional
+    subject: required
+    session: optional
+    acquisition: optional
+    direction: optional
     run: optional
     part: optional
diff --git a/bids-validator/schemas/datatypes/eeg.yaml b/bids-validator/schemas/datatypes/eeg.yaml
index f00ae44c1..60178177d 100644
--- a/bids-validator/schemas/datatypes/eeg.yaml
+++ b/bids-validator/schemas/datatypes/eeg.yaml
@@ -11,8 +11,56 @@
     - .fdt
     - .bdf
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
+    acquisition: optional
     run: optional
+- suffixes:
+    - channels
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    task: required
+    acquisition: optional
+    run: optional
+- suffixes:
+    - coordsystem
+  extensions:
+    - .json
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
+- suffixes:
+    - electrodes
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
+    space: optional
+- suffixes:
+    - events
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    task: required
+    acquisition: optional
+    run: optional
+- suffixes:
+    - photo
+  extensions:
+    - .jpg
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
diff --git a/bids-validator/schemas/datatypes/fmap.yaml b/bids-validator/schemas/datatypes/fmap.yaml
index 98d0f6c45..1eb84f7e5 100644
--- a/bids-validator/schemas/datatypes/fmap.yaml
+++ b/bids-validator/schemas/datatypes/fmap.yaml
@@ -13,21 +13,55 @@
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
-    acq: optional
+    subject: required
+    session: optional
+    acquisition: optional
     run: optional
 # Second group
 - suffixes:
     - epi
+    - m0scan
   extensions:
     - .nii.gz
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
-    acq: optional
-    ce: optional
-    dir: required
+    subject: required
+    session: optional
+    acquisition: optional
+    ceagent: optional
+    direction: required
     run: optional
+# Third group
+- suffixes:
+    - TB1DAM
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    flip: required
+    part: optional
+# Fourth group
+- suffixes:
+    - TB1EPI
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    run: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    echo: required
+    flip: required
+    part: optional
diff --git a/bids-validator/schemas/datatypes/func.yaml b/bids-validator/schemas/datatypes/func.yaml
index 8c99a3689..653b86d08 100644
--- a/bids-validator/schemas/datatypes/func.yaml
+++ b/bids-validator/schemas/datatypes/func.yaml
@@ -9,13 +9,13 @@
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
-    ce: optional
-    rec: optional
-    dir: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    direction: optional
     run: optional
     echo: optional
     part: optional
@@ -27,13 +27,13 @@
     - .nii
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
-    ce: optional
-    rec: optional
-    dir: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    direction: optional
     run: optional
     echo: optional
 # Third group
@@ -43,13 +43,13 @@
     - .tsv
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
-    ce: optional
-    rec: optional
-    dir: optional
+    acquisition: optional
+    ceagent: optional
+    reconstruction: optional
+    direction: optional
     run: optional
     echo: optional
 # Fourth group
@@ -60,10 +60,10 @@
     - .tsv.gz
     - .json
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
-    rec: optional
+    acquisition: optional
+    reconstruction: optional
     run: optional
     recording: optional
diff --git a/bids-validator/schemas/datatypes/ieeg.yaml b/bids-validator/schemas/datatypes/ieeg.yaml
index ff7e09314..50c060e35 100644
--- a/bids-validator/schemas/datatypes/ieeg.yaml
+++ b/bids-validator/schemas/datatypes/ieeg.yaml
@@ -12,8 +12,56 @@
     - .fdt
     - .nwb
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
+    acquisition: optional
     run: optional
+- suffixes:
+    - channels
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    task: required
+    acquisition: optional
+    run: optional
+- suffixes:
+    - coordsystem
+  extensions:
+    - .json
+  entities:
+    subject: required
+    session: optional
+    space: optional
+- suffixes:
+    - electrodes
+  extensions:
+    # No json, since electrodes.tsv uses coordsystem.json for metadata
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    space: optional
+    acquisition: optional
+- suffixes:
+    - events
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    task: required
+    acquisition: optional
+    run: optional
+- suffixes:
+    - photo
+  extensions:
+    - .jpg
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
diff --git a/bids-validator/schemas/datatypes/meg.yaml b/bids-validator/schemas/datatypes/meg.yaml
index 136178173..b2c1e3e8e 100644
--- a/bids-validator/schemas/datatypes/meg.yaml
+++ b/bids-validator/schemas/datatypes/meg.yaml
@@ -15,31 +15,71 @@
     - .kdf
     - .mhd
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: required
-    acq: optional
+    acquisition: optional
     run: optional
-    proc: optional
+    processing: optional
     split: optional
 # Second group
 - suffixes:
     - headshape
   extensions:
-    - .pos
-    - .txt
+    - "*"
   entities:
-    sub: required
-    ses: optional
-    acq: optional
-    space: optional
+    subject: required
+    session: optional
+    acquisition: optional
+# Third group
 - suffixes:
     - markers
   extensions:
-    - .json
+    - .sqd
+    - .mrk
   entities:
-    sub: required
-    ses: optional
+    subject: required
+    session: optional
     task: optional
-    acq: optional
+    acquisition: optional
     space: optional
+# Fourth
+- suffixes:
+    - coordsystem
+  extensions:
+    - .json
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
+- suffixes:
+    - channels
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    task: required
+    acquisition: optional
+    run: optional
+    processing: optional
+- suffixes:
+    - events
+  extensions:
+    - .json
+    - .tsv
+  entities:
+    subject: required
+    session: optional
+    task: required
+    acquisition: optional
+    run: optional
+- suffixes:
+    - photo
+  extensions:
+    - .jpg
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
diff --git a/bids-validator/schemas/datatypes/perf.yaml b/bids-validator/schemas/datatypes/perf.yaml
new file mode 100644
index 000000000..be6542071
--- /dev/null
+++ b/bids-validator/schemas/datatypes/perf.yaml
@@ -0,0 +1,40 @@
+---
+# First group
+- suffixes:
+    - asl
+    - m0scan
+  extensions:
+    - .nii.gz
+    - .nii
+    - .json
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
+    reconstruction: optional
+    direction: optional
+    run: optional
+# Second group
+- suffixes:
+    - aslcontext
+  extensions:
+    - .tsv
+    - .json
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
+    reconstruction: optional
+    direction: optional
+    run: optional
+# Third group
+- suffixes:
+    - asllabeling
+  extensions:
+    - .jpg
+  entities:
+    subject: required
+    session: optional
+    acquisition: optional
+    reconstruction: optional
+    run: optional
diff --git a/bids-validator/schemas/entities.yaml b/bids-validator/schemas/entities.yaml
index f1b32de0e..566cf53fd 100644
--- a/bids-validator/schemas/entities.yaml
+++ b/bids-validator/schemas/entities.yaml
@@ -121,7 +121,7 @@ flip:
     denotes the number/index (in the form of a nonnegative integer), not the `FlipAngle`
     value which needs to be stored in the field `FlipAngle` of the separate JSON file.
   format: index
-inv:
+inversion:
   name: Inversion Time
   entity: inv
   description: |
@@ -132,7 +132,7 @@ inv:
     denotes the number/index (in the form of a nonnegative integer), not the `InversionTime`
     value which needs to be stored in the field `InversionTime` of the separate JSON file.
   format: index
-mt:
+mtransfer:
   name: Magnetization Transfer
   entity: mt
   description: |
@@ -207,12 +207,13 @@ split:
     convention.
 
     Instead of a simple renaming, files should be read in and saved under their
-    new names with dedicated tools like MNE, which will ensure that not only
-    the file names, but also the internal file pointers will be updated.
+    new names with dedicated tools like [MNE-Python](https://mne.tools/),
+    which will ensure that not only the file names, but also the internal file
+    pointers will be updated.
     It is RECOMMENDED that .fif files with multiple parts use the
     `split-<index>` entity to indicate each part.
   format: index
-res:
+resolution:
   name: Resolution
   entity: res
   description: |
@@ -222,7 +223,7 @@ res:
 
     This entity is only applicable to derivative data.
   format: label
-den:
+density:
   name: Density
   entity: den
   description: |
@@ -242,7 +243,7 @@ label:
 
     This entity is only applicable to derivative data.
   format: label
-desc:
+description:
   name: Description
   entity: desc
   description: |
diff --git a/bids-validator/schemas/index.js b/bids-validator/schemas/index.js
index 50e5d045d..ebc49685f 100644
--- a/bids-validator/schemas/index.js
+++ b/bids-validator/schemas/index.js
@@ -37,10 +37,13 @@ const generateRegex = (pythonRegex = false) => {
         if (entity === 'sub' || entity === 'ses') {
           return
         }
-        let format = regex[Object.values(entities).find(elem => elem.entity === entity).format]
+        console.log(type)
+        console.log(entity)
+        console.log('-----------')
+        let format = regex[entities[entity].format]
         file_regex = file_regex.concat(
           `(?${P}<${entity}>_${entity}-${format})${
-            regex[datatype_yaml.entities[entity]]
+            regex[entities[entity].entity]
           }`,
         )
       })
diff --git a/bids-validator/schemas/modalities.yaml b/bids-validator/schemas/modalities.yaml
index f49e671b6..59fc9f092 100644
--- a/bids-validator/schemas/modalities.yaml
+++ b/bids-validator/schemas/modalities.yaml
@@ -6,6 +6,7 @@ mri:
     - dwi
     - fmap
     - func
+    - perf
 eeg:
   name: Electroencephalography
   datatypes:
diff --git a/bids-validator/schemas/regex.json b/bids-validator/schemas/regex.json
index 7f3c946e3..22a5aeae5 100644
--- a/bids-validator/schemas/regex.json
+++ b/bids-validator/schemas/regex.json
@@ -1,35 +1,58 @@
 {
   "anat": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PD|PDmap|PDT2|inplaneT1|inplaneT2|angio)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<run>_run-[0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<mod>_mod-[a-zA-Z0-9]+)?_(?<suffix>defacemask)(?<ext>.nii.gz|.nii|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>T1w|T2w|PDw|T2starw|FLAIR|inplaneT1|inplaneT2|PDT2|angio)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined_(?<suffix>T1map|T2map|T2starmap|R1map|R2map|R2starmap|PDmap|MTRmap|MTsat|UNIT1|T1rho|MWFmap|MTVmap|PDT2map|Chimap|TB1map|RB1map|S0map|M0map)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<modality>_modality-[a-zA-Z0-9]+)undefined_(?<suffix>defacemask)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<echo>_echo-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>MESE|MEGRE)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<flip>_flip-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>VFA)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<inversion>_inversion-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>IRT1)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<echo>_echo-[0-9]+)undefined(?<flip>_flip-[0-9]+)undefined(?<inversion>_inversion-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>MP2RAGE)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<echo>_echo-[0-9]+)undefined(?<flip>_flip-[0-9]+)undefined(?<mtransfer>_mtransfer-[a-zA-Z0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>MPM|MTS)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?anat[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<mtransfer>_mtransfer-[a-zA-Z0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>MTR)(?<ext>.nii.gz|.nii|.json)$"
   ],
   "beh": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>stim|physio)(?<ext>.tsv.gz|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>events|beh)(?<ext>.tsv|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<recording>_recording-[a-zA-Z0-9]+)undefined_(?<suffix>stim|physio)(?<ext>.tsv.gz|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?beh[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>events|beh)(?<ext>.tsv|.json)$"
   ],
   "dwi": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>dwi)(?<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>sbref)(?<ext>.nii.gz|.nii|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<direction>_direction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>dwi)(?<ext>.nii.gz|.nii|.json|.bvec|.bval)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?dwi[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<direction>_direction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>sbref)(?<ext>.nii.gz|.nii|.json)$"
   ],
   "eeg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>eeg)(?<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>eeg)(?<ext>.json|.edf|.vhdr|.vmrk|.eeg|.set|.fdt|.bdf)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>channels)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>coordsystem)(?<ext>.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<space>_space-[a-zA-Z0-9]+)undefined_(?<suffix>electrodes)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>events)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?eeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>photo)(?<ext>.jpg)$"
   ],
   "fmap": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>phasediff|phase1|phase2|magnitude1|magnitude2|magnitude|fieldmap)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)(?<run>_run-[0-9]+)?_(?<suffix>epi)(?<ext>.nii.gz|.nii|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>phasediff|phase1|phase2|magnitude1|magnitude2|magnitude|fieldmap)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<direction>_direction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>epi|m0scan)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<flip>_flip-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>TB1DAM)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?fmap[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<echo>_echo-[0-9]+)undefined(?<flip>_flip-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>TB1EPI)(?<ext>.nii.gz|.nii|.json)$"
   ],
   "func": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?(?<part>_part-[a-zA-Z0-9]+)?_(?<suffix>bold|cbv|sbref)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>phase)(?<ext>.nii.gz|.nii|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<ce>_ce-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<dir>_dir-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<echo>_echo-[0-9]+)?_(?<suffix>events)(?<ext>.tsv|.json)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<rec>_rec-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<recording>_recording-[a-zA-Z0-9]+)?_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<direction>_direction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<echo>_echo-[0-9]+)undefined(?<part>_part-[a-zA-Z0-9]+)undefined_(?<suffix>bold|cbv|sbref)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<direction>_direction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<echo>_echo-[0-9]+)undefined_(?<suffix>phase)(?<ext>.nii.gz|.nii|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<ceagent>_ceagent-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<direction>_direction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<echo>_echo-[0-9]+)undefined_(?<suffix>events)(?<ext>.tsv|.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?func[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<reconstruction>_reconstruction-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<recording>_recording-[a-zA-Z0-9]+)undefined_(?<suffix>physio|stim)(?<ext>.tsv.gz|.json)$"
   ],
   "ieeg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?_(?<suffix>ieeg)(?<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>ieeg)(?<ext>.mefd/|.json|.edf|.vhdr|.eeg|.vmrk|.set|.fdt|.nwb)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>channels)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<space>_space-[a-zA-Z0-9]+)undefined_(?<suffix>coordsystem)(?<ext>.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<space>_space-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>electrodes)(?<ext>.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>events)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?ieeg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>photo)(?<ext>.jpg)$"
   ],
   "meg": [
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)(?<acq>_acq-[a-zA-Z0-9]+)?(?<run>_run-[0-9]+)?(?<proc>_proc-[a-zA-Z0-9]+)?(?<split>_split-[0-9]+)?_(?<suffix>meg)(?<ext>/|.ds/|.json|.fif|.sqd|.con|.raw|.ave|.mrk|.kdf|.mhd)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>headshape)(?<ext>.pos|.txt)$",
-    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<task>_task-[a-zA-Z0-9]+)?(?<acq>_acq-[a-zA-Z0-9]+)?(?<space>_space-[a-zA-Z0-9]+)?_(?<suffix>markers)(?<ext>.json)$"
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<processing>_processing-[a-zA-Z0-9]+)undefined(?<split>_split-[0-9]+)undefined_(?<suffix>meg)(?<ext>/|.ds/|.json|.fif|.sqd|.con|.raw|.ave|.mrk|.kdf|.mhd)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>headshape)(?<ext>*)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<space>_space-[a-zA-Z0-9]+)undefined_(?<suffix>markers)(?<ext>.sqd|.mrk)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>coordsystem)(?<ext>.json)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined(?<processing>_processing-[a-zA-Z0-9]+)undefined_(?<suffix>channels)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<task>_task-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined(?<run>_run-[0-9]+)undefined_(?<suffix>events)(?<ext>.json|.tsv)$",
+    "^[\\/\\\\](sub-[a-zA-Z0-9]+)[\\/\\\\](?:(ses-[a-zA-Z0-9]+)[\\/\\\\])?meg[\\/\\\\]\\1(_\\2)?(?<subject>_subject-[a-zA-Z0-9]+)undefined(?<session>_session-[a-zA-Z0-9]+)undefined(?<acquisition>_acquisition-[a-zA-Z0-9]+)undefined_(?<suffix>photo)(?<ext>.jpg)$"
   ]
 }
\ No newline at end of file