@naturalcycles/nodejs-lib 15.90.2 → 15.92.0

package/src/validation/ajv/from-data/generateJsonSchemaFromData.ts

@@ -1,7 +1,7 @@
 import { _uniq } from '@naturalcycles/js-lib/array'
 import { _stringMapEntries } from '@naturalcycles/js-lib/types'
 import type { AnyObject, StringMap } from '@naturalcycles/js-lib/types'
-import type { JsonSchema } from '../jsonSchemaBuilder.js'
+import type { JsonSchema } from '../ajvSchema.js'
 
 type PrimitiveType = 'undefined' | 'null' | 'boolean' | 'string' | 'number'
 type Type = PrimitiveType | 'array' | 'object'

package/src/validation/ajv/getAjv.ts

@@ -13,7 +13,7 @@ import type {
   JsonSchemaIsoMonthOptions,
   JsonSchemaStringEmailOptions,
   JsonSchemaTerminal,
-} from './jsonSchemaBuilder.js'
+} from './ajvSchema.js'
 
 /* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
 // oxlint-disable unicorn/prefer-code-point
@@ -570,7 +570,7 @@ export function createAjv(opt?: Options): Ajv2020 {
       const { propertyName, schemaDictionary } = config
 
       const isValidFnByKey: Record<any, ValidateFunction> = _mapObject(
-        schemaDictionary as Record<any, JsonSchemaTerminal<any, any, any>>,
+        schemaDictionary as Record<any, JsonSchemaTerminal<any, any>>,
         (key, value) => {
           return [key, ajv.compile(value)]
         },
@@ -607,7 +607,7 @@ export function createAjv(opt?: Options): Ajv2020 {
     modifying: true,
     errors: true,
     schemaType: 'array',
-    compile(schemas: JsonSchemaTerminal<any, any, any>[], _parentSchema, _it) {
+    compile(schemas: JsonSchemaTerminal<any, any>[], _parentSchema, _it) {
       const validators = schemas.map(schema => ajv.compile(schema))
 
       function validate(data: AnyObject, ctx: any): boolean {
@@ -725,6 +725,13 @@ export function createAjv(opt?: Options): Ajv2020 {
     },
   })
 
+  // postValidation is handled in AjvSchema.getValidationResult, not by Ajv itself.
+  // We register it here so Ajv's strict mode doesn't reject the keyword.
+  ajv.addKeyword({
+    keyword: 'postValidation',
+    valid: true,
+  })
+
   return ajv
 }
 

package/src/validation/ajv/index.ts

@@ -4,6 +4,5 @@ export * from './ajvSchema.js'
 export * from './ajvValidationError.js'
 export * from './from-data/generateJsonSchemaFromData.js'
 export * from './getAjv.js'
-export * from './jsonSchemaBuilder.js'
 
 export { Ajv }

package/src/validation/ajv/jsonSchemaBuilder.util.ts

@@ -1,7 +1,7 @@
 import { _uniq } from '@naturalcycles/js-lib/array'
 import { _filterNullishValues } from '@naturalcycles/js-lib/object'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import type { JsonSchema } from './jsonSchemaBuilder.js'
+import type { JsonSchema } from './ajvSchema.js'
 
 export const JSON_SCHEMA_ORDER = [
   '$schema',