Merge remote-tracking branch 'upstream/main' into dev

Author: effigies

CHANGELOG.md

@@ -1,4 +1,16 @@
 
+<a id='changelog-"2.0.8"'></a>
+# "2.0.8" — 2025-08-07
+
+## Added
+
+- Support multi-inheritance for associated files.
+  This will allow for multiple `electrodes.tsv` files,
+  distinguished by the `space-` entity. ([#206] [#207])
+
+[#206]: https://github.com/bids-standard/bids-validator/issues/206
+[#207]: https://github.com/bids-standard/bids-validator/pull/207
+
 <a id='changelog-2.0.7'></a>
 # 2.0.7 — 2025-06-03
 

build.ts

@@ -6,7 +6,7 @@
  */
 import * as esbuild from 'https://deno.land/x/[email protected]/mod.js'
 import { parse } from 'https://deno.land/[email protected]/flags/mod.ts'
-import { denoPlugins } from "jsr:@luca/esbuild-[email protected]"
+import { denoPlugin } from "jsr:@deno/esbuild-[email protected]";
 import * as path from "https://deno.land/[email protected]/path/mod.ts"
 import { getVersion } from './src/version.ts'
 
@@ -51,7 +51,7 @@ const result = await esbuild.build({
   target: ['chrome109', 'firefox109', 'safari16'],
   plugins: [
     versionPlugin,
-    ...denoPlugins({
+    denoPlugin({
       configPath: path.join(dir, 'deno.json'),
     }),
   ],

changelog.d/20250807_170325_markiewicz_update_schema.md

@@ -0,0 +1,34 @@
+### Changed
+
+- Upgraded to BIDS schema version 1.0.13.
+
+<!--
+### Fixed
+
+- A bullet item for the Fixed category.
+
+-->
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category.
+
+-->
+<!--
+### Removed
+
+- A bullet item for the Removed category.
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category.
+
+-->
+<!--
+### Infrastructure
+
+- A bullet item for the Infrastructure category.
+
+-->

changelog.d/20250808_135941_rosswilsonblair_raise_error_on_non_object_json.md

@@ -0,0 +1,47 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Added
+
+- A bullet item for the Added category.
+
+-->
+### Changed
+
+- Raise error when JSON files are parsed and their root value is anything other than an object
+
+<!--
+### Fixed
+
+- A bullet item for the Fixed category.
+
+-->
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category.
+
+-->
+<!--
+### Removed
+
+- A bullet item for the Removed category.
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category.
+
+-->
+<!--
+### Infrastructure
+
+- A bullet item for the Infrastructure category.
+
+-->

changelog.d/20250530_082223_markiewicz_multi_inheritance.md renamed to changelog.d/20250819_113044_markiewicz_display_version.md

@@ -7,12 +7,7 @@ For top level release notes, leave all the headers commented out.
 
 ### Added
 
-- Support multi-inheritance for associated files.
-  This will allow for multiple `electrodes.tsv` files,
-  distinguished by the `space-` entity. ([#206] [#207])
-
-[#206]: https://github.com/bids-standard/bids-validator/issues/206
-[#207]: https://github.com/bids-standard/bids-validator/pull/207
+- Display version in web app
 
 <!--
 ### Changed

deno.lock

@@ -1,7 +1,6 @@
 import type { BIDSFile, FileTree } from '../types/filetree.ts'
 import { readEntities } from '../schema/entities.ts'
 
-
 type Ret<T> = T extends [string, ...string[]] ? (BIDSFile | BIDSFile[]) : BIDSFile
 
 /** Find associated files in order of proximity to a source file.

src/files/inheritance.ts

@@ -22,9 +22,17 @@ async function readJSONText(file: BIDSFile): Promise<string> {
 
 export async function loadJSON(file: BIDSFile): Promise<Record<string, unknown>> {
   const text = await readJSONText(file) // Raise encoding errors
+  let parsedText
   try {
-    return JSON.parse(text)
+    parsedText = JSON.parse(text)
   } catch (error) {
     throw { key: 'JSON_INVALID' } // Raise syntax errors
   }
+  if (Array.isArray(parsedText) || typeof parsedText !== 'object') {
+    throw {
+      key: 'JSON_NOT_AN_OBJECT',
+      evidence: text.substring(0, 10) + (text.length > 10 ? '...' : ''),
+    }
+  }
+  return parsedText
 }

src/files/json.ts

@@ -9,6 +9,10 @@ export const bidsIssues: IssueDefinitionRecord = {
     severity: 'error',
     reason: 'Not a valid JSON file.',
   },
+  JSON_NOT_AN_OBJECT: {
+    severity: 'error',
+    reason: 'Parsed JSON file does not contain an object.',
+  },
   MISSING_DATASET_DESCRIPTION: {
     severity: 'error',
     reason: 'A dataset_description.json file is required in the root of the dataset',

src/issues/list.ts

@@ -10,6 +10,7 @@ import { consoleFormat, resultToJSONStr } from './utils/output.ts'
 import { setupLogging } from './utils/logger.ts'
 import type { ValidationResult } from './types/validation-result.ts'
 export type { ValidationResult } from './types/validation-result.ts'
+export { getVersion } from './version.ts'
 
 /**
  * Validation entrypoint intended for command line usage with Deno