Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/bids/types/json.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ export class BidsSidecar extends BidsJsonFile {
}

if (BidsSidecar._sidecarValueHasHed(value)) {
// The second-level HED key is valid, but a HED key deeper in the same entry is not.
for (const [subkey, subvalue] of Object.entries(value)) {
if (subkey !== 'HED') {
this._verifyKeyHasNoDeepHed(subkey, subvalue, key)
}
}
return [key, new BidsSidecarKey(key, value.HED, this)]
}

Expand Down
23 changes: 23 additions & 0 deletions tests/otherTests/issueParameters.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,29 @@ describe('Issue Parameters Tests', () => {
expect(thrownError.issue.parameters.key).toBe('event_code')
})

test.each([
['in a sibling object', { trial: { HED: 'Red', metadata: { HED: 'Blue' } } }],
['deep in a sibling object', { trial: { HED: { face: 'Red' }, extra: { inner: { HED: 'Blue' } } } }],
])('should throw error for a deep HED key %s beside a valid second-level HED', (_, invalidData) => {
const thrownError = captureError(invalidData)

expectError(thrownError, 'illegalSidecarHedDeepKey', 'SIDECAR_INVALID')
expect(thrownError.issue.parameters.key).toBe('trial')
expect(thrownError.issue.parameters.sidecarKey).toBe('trial')
})

test('should not throw error for sibling metadata without HED beside a valid second-level HED', () => {
const sidecar = new BidsSidecar(
'test.json',
{ path: 'test.json' },
{
trial: { HED: { face: 'Red' }, Levels: { face: 'A face' }, Description: 'Trial type' },
},
)
expect(sidecar).toBeInstanceOf(BidsSidecar)
expect(sidecar.sidecarKeys.has('trial')).toBe(true)
})

test('should validate complete error structure and message', () => {
const invalidData = createInvalidData(3)
const thrownError = captureError(invalidData)
Expand Down
Loading