-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Add context support #427
Open
o-rumiantsev
wants to merge
1
commit into
master
Choose a base branch
from
add-context-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+179
−31
Open
Add context support #427
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add support for context
commit a09ffacff91cd93140c94f43e5664231595a8d48
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
'use strict'; | ||
|
||
const { SchemaValidationError } = require('metaschema').errors; | ||
|
||
const addContext = (context, ms) => { | ||
const errors = []; | ||
const isDuplicated = ms.context.size > 0; | ||
if (isDuplicated) { | ||
errors.push( | ||
new SchemaValidationError('duplicate', context.name, { | ||
type: 'context', | ||
value: context.name, | ||
}) | ||
); | ||
} else { | ||
Object.entries(context.definition).forEach(([name, field]) => | ||
ms.context.set(name, field) | ||
); | ||
} | ||
return errors; | ||
}; | ||
|
||
const postprocessContext = (context, ms) => { | ||
const errors = []; | ||
for (const [fieldName, field] of Object.entries(context.definition)) { | ||
const domain = ms.domains.get(field.domain); | ||
if (domain) { | ||
field.definition = domain; | ||
} else { | ||
errors.push( | ||
new SchemaValidationError( | ||
'unresolved', | ||
`${context.name}.${fieldName}`, | ||
{ type: 'domain', value: field.domain } | ||
) | ||
); | ||
} | ||
} | ||
return errors; | ||
}; | ||
|
||
const validateContext = (ms, schema, instance, options) => { | ||
const { domain } = schema; | ||
const error = ms.validate('domains', domain, instance, options); | ||
return error ? error.errors : []; | ||
}; | ||
|
||
module.exports = { | ||
addContext, | ||
postprocessContext, | ||
validateContext, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
({ | ||
Nomen: { domain: 'Nomen' }, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
({ | ||
Nomen: { type: 'string' }, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
({ | ||
DuplicateNomen: { domain: 'Nomen' }, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
({ | ||
Nomen: { domain: 'Nomen' }, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
Action({ | ||
Public: true, | ||
Args: { | ||
valueFromContext: { context: 'NomenFromContext' }, | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
({ | ||
NomenFromContext: { domain: 'Nomen' }, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
({ | ||
Nomen: { type: 'string' }, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
'use strict'; | ||
|
||
const metaschema = require('metaschema'); | ||
const metatests = require('metatests'); | ||
|
||
const { options, config } = require('../lib/metaschema-config/config'); | ||
|
||
const { | ||
MetaschemaError, | ||
SchemaValidationError, | ||
ValidationError, | ||
} = metaschema.errors; | ||
|
||
metatests.test('metaschema correct context usage', async test => { | ||
const schema = await metaschema.fs.load( | ||
'test/fixtures/context/valid', | ||
options, | ||
config | ||
); | ||
|
||
test.assertNot( | ||
schema.validate('action', 'PublicAction', { valueFromContext: 'value' }) | ||
); | ||
|
||
test.isError( | ||
schema.validate('action', 'PublicAction', { valueFromContext: 10 }), | ||
new MetaschemaError([ | ||
new ValidationError('invalidType', 'valueFromContext', { | ||
expected: 'string', | ||
actual: 'number', | ||
}), | ||
]) | ||
); | ||
}); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add a positive test, to ensure that it is possible to use |
||
metatests.test('metaschema context error on duplicated domains', async test => { | ||
await test.rejects( | ||
metaschema.fs.load('test/fixtures/context/duplicate', options, config), | ||
new MetaschemaError([ | ||
new SchemaValidationError('duplicate', 'duplicateDomain', { | ||
type: 'context', | ||
value: 'duplicateDomain', | ||
}), | ||
]) | ||
); | ||
}); | ||
|
||
metatests.test('metaschema context error on unresolved domain', async test => { | ||
await test.rejects( | ||
metaschema.fs.load('test/fixtures/context/unresolved', options, config), | ||
new MetaschemaError([ | ||
new SchemaValidationError('unresolved', 'context.Nomen', { | ||
type: 'domain', | ||
value: 'Nomen', | ||
}), | ||
]) | ||
); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.