Skip to content

Check for keys in term definition outside that expected #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidlehn merged 2 commits into from
Jan 19, 2018
Merged

Check for keys in term definition outside that expected #214

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7594c41
Check for keys in term definition outside that expected: `@container`…
gkellogg Jan 14, 2018
beb3cea
Remove `@nest` bits that were inadvertently included.
gkellogg Jan 15, 2018
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
23 changes: 23 additions & 0 deletions lib/context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,31 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
const mapping = activeCtx.mappings[term] = {};
mapping.reverse = false;

// make sure term definition only has expected keywords
const validKeys = ['@container', '@id', '@language', '@reverse', '@type'];

for(let kw in value) {
if(!validKeys.includes(kw)) {
throw new JsonLdError(
'Invalid JSON-LD syntax; a term definition must not contain ' + kw,
'jsonld.SyntaxError',
{code: 'invalid term definition', context: localCtx});
}
}

if('@reverse' in value) {
if('@id' in value) {
throw new JsonLdError(
'Invalid JSON-LD syntax; a @reverse term definition must not ' +
'contain @id.', 'jsonld.SyntaxError',
{code: 'invalid reverse property', context: localCtx});
}
if('@nest' in value) {
throw new JsonLdError(
'Invalid JSON-LD syntax; a @reverse term definition must not ' +
'contain @nest.', 'jsonld.SyntaxError',
{code: 'invalid reverse property', context: localCtx});
}
const reverse = value['@reverse'];
if(!_isString(reverse)) {
throw new JsonLdError(
Expand Down Expand Up @@ -442,6 +460,10 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
mapping['@language'] = language;
}

if('@next' in value) {

}
Copy link
Member

@davidlehn davidlehn Jan 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing something here?

Copy link
Collaborator Author

@gkellogg gkellogg Jan 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should have been removed, and should have been @nest for a different branch.


// disallow aliasing @context and @preserve
const id = mapping['@id'];
if(id === '@context' || id === '@preserve') {
Expand Down Expand Up @@ -807,6 +829,7 @@ api.isKeyword = v => {
case '@index':
case '@language':
case '@list':
case '@nest':
case '@omitDefault':
case '@preserve':
case '@requireAll':
Expand Down