Merge pull request #132 from i-VRESSE/reclustrsmd

Regenerate catalogs from interactive rescore branch
i-VRESSE · Jan 25, 2024 · 6c02cd3 · 6c02cd3
2 parents ec6e1f0 + a65291f
commit 6c02cd3
Show file tree

Hide file tree

Showing 5 changed files with 847 additions and 107 deletions.
diff --git a/packages/core/src/resolveMaxItemsFrom.ts b/packages/core/src/resolveMaxItemsFrom.ts
@@ -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)
+  }
+}
diff --git a/packages/core/src/validate.ts b/packages/core/src/validate.ts
@@ -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({
@@ -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> {