@naturalcycles/nodejs-lib 15.93.0 → 15.95.0

package/dist/validation/ajv/jsonSchemaBuilder.util.d.ts

@@ -1,5 +1,5 @@
 import type { AnyObject } from '@naturalcycles/js-lib/types';
-import type { JsonSchema } from './ajvSchema.js';
+import type { JsonSchema } from './jSchema.js';
 export declare const JSON_SCHEMA_ORDER: string[];
 /**
  * Merges s2 into s1 (mutates s1) and returns s1.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.93.0",
+  "version": "15.95.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/jwt/jwt.service.ts

@@ -4,7 +4,7 @@ import { _errorDataAppend } from '@naturalcycles/js-lib/error/error.util.js'
 import type { AnyObject, JWTString } from '@naturalcycles/js-lib/types'
 import type { Algorithm, JwtHeader, SignOptions, VerifyOptions } from 'jsonwebtoken'
 import jsonwebtoken from 'jsonwebtoken'
-import type { AjvSchema } from '../validation/ajv/ajvSchema.js'
+import type { AjvSchema, JSchema } from '../validation/ajv/jSchema.js'
 export { jsonwebtoken }
 export type { Algorithm, JwtHeader, SignOptions, VerifyOptions }
 
@@ -63,7 +63,11 @@ export interface JWTServiceCfg {
 export class JWTService {
   constructor(public cfg: JWTServiceCfg) {}
 
-  sign<T extends AnyObject>(payload: T, schema?: AjvSchema<T>, opt: SignOptions = {}): JWTString {
+  sign<T extends AnyObject>(
+    payload: T,
+    schema?: JSchema<T, any> | AjvSchema<T>,
+    opt: SignOptions = {},
+  ): JWTString {
     _assert(
       this.cfg.privateKey,
       'JWTService: privateKey is required to be able to verify, but not provided',
@@ -81,7 +85,7 @@ export class JWTService {
 
   verify<T extends AnyObject>(
     token: JWTString,
-    schema?: AjvSchema<T>,
+    schema?: JSchema<T, any> | AjvSchema<T>,
     opt: VerifyOptions = {},
     publicKey?: string, // allows to override public key
   ): T {
@@ -112,7 +116,7 @@ export class JWTService {
 
   decode<T extends AnyObject>(
     token: JWTString,
-    schema?: AjvSchema<T>,
+    schema?: JSchema<T, any> | AjvSchema<T>,
   ): {
     header: JwtHeader
     payload: T

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 '../ajvSchema.js'
+import { _stringMapEntries } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '../jSchema.js'
 
 type PrimitiveType = 'undefined' | 'null' | 'boolean' | 'string' | 'number'
 type Type = PrimitiveType | 'array' | 'object'

package/src/validation/ajv/getAjv.ts

@@ -3,17 +3,17 @@ import { _assert } from '@naturalcycles/js-lib/error'
 import { _deepCopy, _mapObject, Set2 } from '@naturalcycles/js-lib/object'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import { Ajv2020 } from 'ajv/dist/2020.js'
 import type { Options, ValidateFunction } from 'ajv/dist/2020.js'
+import { Ajv2020 } from 'ajv/dist/2020.js'
 import { validTLDs } from '../tlds.js'
 import type {
   CustomConverterFn,
   CustomValidatorFn,
+  JSchema,
   JsonSchemaIsoDateOptions,
   JsonSchemaIsoMonthOptions,
   JsonSchemaStringEmailOptions,
-  JsonSchemaTerminal,
-} from './ajvSchema.js'
+} from './jSchema.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>>,
+        schemaDictionary as Record<any, JSchema<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>[], _parentSchema, _it) {
+    compile(schemas: JSchema<any, any>[], _parentSchema, _it) {
       const validators = schemas.map(schema => ajv.compile(schema))
 
       function validate(data: AnyObject, ctx: any): boolean {

package/src/validation/ajv/index.ts

@@ -1,8 +1,8 @@
 import Ajv from 'ajv'
 
-export * from './ajvSchema.js'
 export * from './ajvValidationError.js'
 export * from './from-data/generateJsonSchemaFromData.js'
 export * from './getAjv.js'
+export * from './jSchema.js'
 
 export { Ajv }