@naturalcycles/nodejs-lib 15.10.0 → 15.11.0

package/dist/jwt/jwt.service.d.ts

@@ -1,8 +1,8 @@
 import type { ErrorData } from '@naturalcycles/js-lib/error';
 import type { AnyObject, JWTString } from '@naturalcycles/js-lib/types';
-import type { AnySchema } from 'joi';
 import type { Algorithm, JwtHeader, SignOptions, VerifyOptions } from 'jsonwebtoken';
 import jsonwebtoken from 'jsonwebtoken';
+import type { AjvSchema } from '../validation/ajv/ajvSchema.js';
 export { jsonwebtoken };
 export type { Algorithm, JwtHeader, SignOptions, VerifyOptions };
 export interface JWTServiceCfg {
@@ -50,9 +50,9 @@ export interface JWTServiceCfg {
 export declare class JWTService {
     cfg: JWTServiceCfg;
     constructor(cfg: JWTServiceCfg);
-    sign<T extends AnyObject>(payload: T, schema?: AnySchema<T>, opt?: SignOptions): JWTString;
-    verify<T extends AnyObject>(token: JWTString, schema?: AnySchema<T>, opt?: VerifyOptions, publicKey?: string): T;
-    decode<T extends AnyObject>(token: JWTString, schema?: AnySchema<T>): {
+    sign<T extends AnyObject>(payload: T, schema?: AjvSchema<T>, opt?: SignOptions): JWTString;
+    verify<T extends AnyObject>(token: JWTString, schema?: AjvSchema<T>, opt?: VerifyOptions, publicKey?: string): T;
+    decode<T extends AnyObject>(token: JWTString, schema?: AjvSchema<T>): {
         header: JwtHeader;
         payload: T;
         signature: string;

package/dist/jwt/jwt.service.js

@@ -1,8 +1,6 @@
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { _errorDataAppend } from '@naturalcycles/js-lib/error/error.util.js';
 import jsonwebtoken from 'jsonwebtoken';
-import { anyObjectSchema } from '../validation/joi/joi.shared.schemas.js';
-import { validate } from '../validation/joi/joi.validation.util.js';
 export { jsonwebtoken };
 // todo: define JWTError and list possible options
 // jwt expired (TokenExpiredError)
@@ -26,9 +24,9 @@ export class JWTService {
     }
     sign(payload, schema, opt = {}) {
         _assert(this.cfg.privateKey, 'JWTService: privateKey is required to be able to verify, but not provided');
-        if (schema) {
-            validate(payload, schema);
-        }
+        schema?.validate(payload, {
+            mutateInput: true,
+        });
         return jsonwebtoken.sign(payload, this.cfg.privateKey, {
             algorithm: this.cfg.algorithm,
             noTimestamp: true,
@@ -44,9 +42,9 @@ export class JWTService {
                 ...this.cfg.verifyOptions,
                 ...opt,
             });
-            if (schema) {
-                validate(data, schema);
-            }
+            schema?.validate(data, {
+                mutateInput: true,
+            });
             return data;
         }
         catch (err) {
@@ -65,7 +63,9 @@ export class JWTService {
         _assert(data?.payload, 'invalid token, decoded value is empty', {
             ...this.cfg.errorData,
         });
-        validate(data.payload, schema || anyObjectSchema);
+        schema?.validate(data.payload, {
+            mutateInput: true,
+        });
         return data;
     }
 }

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import type { BaseDBEntity, IANATimezone, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import type { BaseDBEntity, IANATimezone, IsoDate, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
 import type { NumberSchema } from './number.extensions.js';
 import type { StringSchema } from './string.extensions.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.10.0",
+  "version": "15.11.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -80,6 +80,7 @@
   "license": "MIT",
   "envByBranch": {
     "master": "master",
+    "main": "master",
     "*": "branch"
   },
   "scripts": {

package/src/jwt/jwt.service.ts

@@ -2,11 +2,9 @@ import type { ErrorData } from '@naturalcycles/js-lib/error'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
 import { _errorDataAppend } from '@naturalcycles/js-lib/error/error.util.js'
 import type { AnyObject, JWTString } from '@naturalcycles/js-lib/types'
-import type { AnySchema } from 'joi'
 import type { Algorithm, JwtHeader, SignOptions, VerifyOptions } from 'jsonwebtoken'
 import jsonwebtoken from 'jsonwebtoken'
-import { anyObjectSchema } from '../validation/joi/joi.shared.schemas.js'
-import { validate } from '../validation/joi/joi.validation.util.js'
+import type { AjvSchema } from '../validation/ajv/ajvSchema.js'
 export { jsonwebtoken }
 export type { Algorithm, JwtHeader, SignOptions, VerifyOptions }
 
@@ -65,15 +63,15 @@ export interface JWTServiceCfg {
 export class JWTService {
   constructor(public cfg: JWTServiceCfg) {}
 
-  sign<T extends AnyObject>(payload: T, schema?: AnySchema<T>, opt: SignOptions = {}): JWTString {
+  sign<T extends AnyObject>(payload: T, schema?: AjvSchema<T>, opt: SignOptions = {}): JWTString {
     _assert(
       this.cfg.privateKey,
       'JWTService: privateKey is required to be able to verify, but not provided',
     )
 
-    if (schema) {
-      validate(payload, schema)
-    }
+    schema?.validate(payload, {
+      mutateInput: true,
+    })
 
     return jsonwebtoken.sign(payload, this.cfg.privateKey, {
       algorithm: this.cfg.algorithm,
@@ -85,7 +83,7 @@ export class JWTService {
 
   verify<T extends AnyObject>(
     token: JWTString,
-    schema?: AnySchema<T>,
+    schema?: AjvSchema<T>,
     opt: VerifyOptions = {},
     publicKey?: string, // allows to override public key
   ): T {
@@ -101,9 +99,9 @@ export class JWTService {
         ...opt,
       }) as T
 
-      if (schema) {
-        validate(data, schema)
-      }
+      schema?.validate(data, {
+        mutateInput: true,
+      })
 
       return data
     } catch (err) {
@@ -118,7 +116,7 @@ export class JWTService {
 
   decode<T extends AnyObject>(
     token: JWTString,
-    schema?: AnySchema<T>,
+    schema?: AjvSchema<T>,
   ): {
     header: JwtHeader
     payload: T
@@ -136,7 +134,9 @@ export class JWTService {
       ...this.cfg.errorData,
     })
 
-    validate(data.payload, schema || anyObjectSchema)
+    schema?.validate(data.payload, {
+      mutateInput: true,
+    })
 
     return data
   }

package/src/validation/joi/joi.shared.schemas.ts

@@ -7,6 +7,7 @@ import {
 import type {
   BaseDBEntity,
   IANATimezone,
+  IsoDate,
   IsoDateTime,
   NumberEnum,
   StringEnum,
@@ -26,7 +27,7 @@ export const numberSchema = Joi.number()
 export const numberSchemaTyped = <T>(): NumberSchema<T> => Joi.number<T>()
 export const integerSchema = Joi.number().integer()
 export const percentageSchema = Joi.number().integer().min(0).max(100)
-export const dateStringSchema = stringSchema.dateString()
+export const dateStringSchema: StringSchema<IsoDate> = stringSchema.dateString()
 export const binarySchema = Joi.binary()
 export const dateObjectSchema = Joi.object().instance(Date)