Skip to content
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

Regenerate catalogs from interactive rescore branch #132

Merged
merged 4 commits into from
Jan 25, 2024
Merged

Regenerate catalogs from interactive rescore branch #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f1a5c3
Regenerate catalogs from https://github.com/haddocking/haddock3/commi…
sverhoeven Nov 3, 2023
4598dff
ignore maxPropertiesFrom keyword in schema during validation
sverhoeven Nov 15, 2023
b35156a
Generate catologs from haddock3 337b96a1900c907297bd5c18983bf8a5e8b215e3
sverhoeven Jan 16, 2024
a65291f
Regenerate config from haddock3 3cf7c296714cfc6b8857082d02c48dacd943221c
sverhoeven Jan 16, 2024
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
13 changes: 13 additions & 0 deletions packages/core/src/resolveMaxItemsFrom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,16 @@ export const ajvKeyword: KeywordDefinition = {
cxt.ok(true)
}
}

/**
* Keyword that can be added to ajv instance with addKeyword()
* to make it aware of `maxPropertiesFrom` keyword in JSON schemas.
*/
export const ajvKeyword2: KeywordDefinition = {
keyword: 'maxPropertiesFrom',
type: 'object',
code (cxt: KeywordCxt) {
// Unable to validate because needs data from outside, so always OK
cxt.ok(true)
}
}
3 changes: 2 additions & 1 deletion packages/core/src/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {
ICatalog,
IFiles
} from './types'
import { ajvKeyword, resolveMaxItemsFrom } from './resolveMaxItemsFrom'
import { ajvKeyword, ajvKeyword2, resolveMaxItemsFrom } from './resolveMaxItemsFrom'
import { addMoleculeValidation, parseMolecules } from './molecule/addMoleculeValidation'

const ajv = new Ajv({
Expand All @@ -25,6 +25,7 @@ const ajv = new Ajv({
addFormats(ajv)
addMoleculeFormats(ajv)
ajv.addKeyword(ajvKeyword)
ajv.addKeyword(ajvKeyword2)

export interface IvresseErrorObject
extends ErrorObject<string, Record<string, any>, unknown> {
Expand Down
Loading
Loading