@naturalcycles/nodejs-lib 12.101.2 → 12.102.0

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import * as globby from 'globby';
 import type { GlobbyOptions } from 'globby';
 import { RequestError, TimeoutError } from 'got';
 import type { AfterResponseHook, BeforeErrorHook, BeforeRequestHook, Got } from 'got';
-import type { AnySchema, ValidationErrorItem } from 'joi';
+import type { AnySchema, ValidationErrorItem, AlternativesSchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, NumberSchema, ObjectSchema, StringSchema } from 'joi';
 export * from './buffer/buffer.util';
 export * from './diff/tableDiff';
 export * from './got/getGot';
@@ -81,5 +81,5 @@ export * from './validation/joi/joi.validation.util';
 export * from './script';
 export * from './jwt/jwt.service';
 export * from './fs/fs.util';
-export type { GlobbyOptions, FastGlobOptions, ValidationErrorItem, AnySchema, Got, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, };
+export type { GlobbyOptions, FastGlobOptions, ValidationErrorItem, Got, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, NumberSchema, ObjectSchema, StringSchema, };
 export { globby, fastGlob, RequestError, TimeoutError, Ajv };

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

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib';
+import { AnySchema } from 'joi';
 import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken';
 import * as jsonwebtoken from 'jsonwebtoken';
-import { AnySchemaTyped } from '../validation/joi/joi.model';
 export { jsonwebtoken };
 export type { Algorithm, VerifyOptions, SignOptions, JwtHeader };
 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?: AnySchemaTyped<T>, opt?: SignOptions): JWTString;
-    verify<T extends AnyObject>(token: JWTString, schema?: AnySchemaTyped<T>, opt?: VerifyOptions, publicKey?: string): T;
-    decode<T extends AnyObject>(token: JWTString, schema?: AnySchemaTyped<T>): {
+    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>): {
         header: JwtHeader;
         payload: T;
         signature: string;

package/dist/validation/joi/joi.extensions.d.ts

@@ -2,8 +2,8 @@ import * as JoiLib from 'joi';
 import { ExtendedNumberSchema } from './number.extensions';
 import { ExtendedStringSchema } from './string.extensions';
 export interface ExtendedJoi extends JoiLib.Root {
-    string: () => ExtendedStringSchema;
-    number: () => ExtendedNumberSchema;
+    string: <TSchema = string>() => ExtendedStringSchema<TSchema>;
+    number: <TSchema = number>() => ExtendedNumberSchema<TSchema>;
 }
 /**
  * This is the only right place to import Joi from

package/dist/validation/joi/joi.model.d.ts

@@ -1,30 +1,3 @@
-/// <reference types="node" />
-import { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, NumberSchema, ObjectSchema, StringSchema } from 'joi';
-export type SchemaTyped<IN, OUT = IN> = AnySchemaTyped<IN, OUT> | ArraySchemaTyped<IN> | AlternativesSchemaTyped<IN> | BinarySchemaTyped | BooleanSchemaTyped | DateSchemaTyped<IN> | FunctionSchemaTyped<IN> | NumberSchemaTyped | ObjectSchemaTyped<IN, OUT> | StringSchemaTyped;
-/**
- * IN - value before validation/conversion
- * OUT - value after validation/conversion (can be different due to conversion, stripping, etc)
- */
-export interface AnySchemaTyped<IN, OUT = IN> extends AnySchema {
-}
-export interface ArraySchemaTyped<T> extends ArraySchema, AnySchemaTyped<T[]> {
-}
-export interface AlternativesSchemaTyped<T> extends AlternativesSchema {
-}
-export interface BinarySchemaTyped extends BinarySchema, AnySchemaTyped<Buffer> {
-}
-export interface BooleanSchemaTyped extends BooleanSchema, AnySchemaTyped<boolean> {
-}
-export interface DateSchemaTyped<T> extends DateSchema {
-}
-export interface FunctionSchemaTyped<T> extends FunctionSchema {
-}
-export interface NumberSchemaTyped extends NumberSchema, AnySchemaTyped<number> {
-}
-export interface ObjectSchemaTyped<IN, OUT = IN> extends ObjectSchema<IN>, AnySchemaTyped<IN, OUT> {
-}
-export interface StringSchemaTyped extends StringSchema, AnySchemaTyped<string> {
-}
 /**
  * This type is useful to allow "joi schema merging".
  * Because by default Joi doesn't allow normal merging.

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

@@ -1,38 +1,40 @@
+/// <reference types="node" />
 import { SavedDBEntity } from '@naturalcycles/js-lib';
-import { AlternativesSchemaTyped, AnySchemaTyped, ArraySchemaTyped, BooleanSchemaTyped, ObjectSchemaTyped, StringSchemaTyped } from './joi.model';
-export declare const booleanSchema: BooleanSchemaTyped;
-export declare const booleanDefaultToFalseSchema: BooleanSchemaTyped;
-export declare const stringSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const numberSchema: import("./number.extensions").ExtendedNumberSchema;
-export declare const integerSchema: import("./number.extensions").ExtendedNumberSchema;
-export declare const percentageSchema: import("./number.extensions").ExtendedNumberSchema;
-export declare const dateStringSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const binarySchema: import("joi").BinarySchema;
-export declare const dateObjectSchema: import("joi").ObjectSchema<any>;
-export declare const urlSchema: (scheme?: string | string[]) => StringSchemaTyped;
-export declare function arraySchema<T>(items?: AnySchemaTyped<T, T>): ArraySchemaTyped<T>;
-export declare function objectSchema<IN, OUT = IN>(schema?: {
-    [key in keyof Partial<IN>]: AnySchemaTyped<IN[key]>;
-}): ObjectSchemaTyped<IN, OUT>;
-export declare function oneOfSchema<T = any>(...schemas: AnySchemaTyped<any>[]): AlternativesSchemaTyped<T>;
-export declare const anySchema: import("joi").AnySchema;
-export declare const anyObjectSchema: import("joi").ObjectSchema<any>;
+import { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
+import { ExtendedStringSchema } from './string.extensions';
+export declare const booleanSchema: import("joi").BooleanSchema<boolean>;
+export declare const booleanDefaultToFalseSchema: import("joi").BooleanSchema<boolean>;
+export declare const stringSchema: ExtendedStringSchema<string>;
+export declare const numberSchema: import("./number.extensions").ExtendedNumberSchema<number>;
+export declare const integerSchema: import("./number.extensions").ExtendedNumberSchema<number>;
+export declare const percentageSchema: import("./number.extensions").ExtendedNumberSchema<number>;
+export declare const dateStringSchema: ExtendedStringSchema<string>;
+export declare const binarySchema: import("joi").BinarySchema<Buffer>;
+export declare const dateObjectSchema: ObjectSchema<any>;
+export declare const urlSchema: (scheme?: string | string[]) => ExtendedStringSchema;
+export declare function arraySchema<T>(items?: AnySchema<T>): ArraySchema<T[]>;
+export declare function objectSchema<T>(schema?: {
+    [key in keyof Partial<T>]: AnySchema<T[key]>;
+}): ObjectSchema<T>;
+export declare function oneOfSchema<T = any>(...schemas: AnySchema[]): AlternativesSchema<T>;
+export declare const anySchema: AnySchema<any>;
+export declare const anyObjectSchema: ObjectSchema<any>;
 export declare const BASE62_REGEX: RegExp;
 export declare const BASE64_REGEX: RegExp;
 export declare const BASE64URL_REGEX: RegExp;
-export declare const base62Schema: import("./string.extensions").ExtendedStringSchema;
-export declare const base64Schema: import("./string.extensions").ExtendedStringSchema;
-export declare const base64UrlSchema: import("./string.extensions").ExtendedStringSchema;
+export declare const base62Schema: ExtendedStringSchema<string>;
+export declare const base64Schema: ExtendedStringSchema<string>;
+export declare const base64UrlSchema: ExtendedStringSchema<string>;
 export declare const JWT_REGEX: RegExp;
-export declare const jwtSchema: import("./string.extensions").ExtendedStringSchema;
+export declare const jwtSchema: ExtendedStringSchema<string>;
 /**
  * [a-zA-Z0-9_]*
  * 6-64 length
  */
-export declare const idSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const idBase62Schema: import("./string.extensions").ExtendedStringSchema;
-export declare const idBase64Schema: import("./string.extensions").ExtendedStringSchema;
-export declare const idBase64UrlSchema: import("./string.extensions").ExtendedStringSchema;
+export declare const idSchema: ExtendedStringSchema<string>;
+export declare const idBase62Schema: ExtendedStringSchema<string>;
+export declare const idBase64Schema: ExtendedStringSchema<string>;
+export declare const idBase64UrlSchema: ExtendedStringSchema<string>;
 /**
  * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
  */
@@ -40,35 +42,35 @@ export declare const SLUG_REGEX: RegExp;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-export declare const slugSchema: import("./string.extensions").ExtendedStringSchema;
+export declare const slugSchema: ExtendedStringSchema<string>;
 /**
  * Between years 1970 and 2050
  */
-export declare const unixTimestampSchema: import("./number.extensions").ExtendedNumberSchema;
+export declare const unixTimestampSchema: import("./number.extensions").ExtendedNumberSchema<number>;
 /**
  * Between years 2000 and 2050
  */
-export declare const unixTimestamp2000Schema: import("./number.extensions").ExtendedNumberSchema;
+export declare const unixTimestamp2000Schema: import("./number.extensions").ExtendedNumberSchema<number>;
 /**
  * Between years 1970 and 2050
  */
-export declare const unixTimestampMillisSchema: import("./number.extensions").ExtendedNumberSchema;
+export declare const unixTimestampMillisSchema: import("./number.extensions").ExtendedNumberSchema<number>;
 /**
  * Between years 2000 and 2050
  */
-export declare const unixTimestampMillis2000Schema: import("./number.extensions").ExtendedNumberSchema;
-export declare const verSchema: import("./number.extensions").ExtendedNumberSchema;
+export declare const unixTimestampMillis2000Schema: import("./number.extensions").ExtendedNumberSchema<number>;
+export declare const verSchema: import("./number.extensions").ExtendedNumberSchema<number>;
 /**
  * Be careful, by default emailSchema does TLD validation. To disable it - use `stringSchema.email({tld: false}).lowercase()`
  */
-export declare const emailSchema: import("./string.extensions").ExtendedStringSchema;
+export declare const emailSchema: ExtendedStringSchema<string>;
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
 export declare const SEM_VER_REGEX: RegExp;
-export declare const semVerSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const userAgentSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const utcOffsetSchema: import("./number.extensions").ExtendedNumberSchema;
-export declare const ipAddressSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const baseDBEntitySchema: ObjectSchemaTyped<Partial<SavedDBEntity<string>>, Partial<SavedDBEntity<string>>>;
-export declare const savedDBEntitySchema: ObjectSchemaTyped<SavedDBEntity<string>, SavedDBEntity<string>>;
+export declare const semVerSchema: ExtendedStringSchema<string>;
+export declare const userAgentSchema: ExtendedStringSchema<string>;
+export declare const utcOffsetSchema: import("./number.extensions").ExtendedNumberSchema<number>;
+export declare const ipAddressSchema: ExtendedStringSchema<string>;
+export declare const baseDBEntitySchema: ObjectSchema<Partial<SavedDBEntity<string>>>;
+export declare const savedDBEntitySchema: ObjectSchema<SavedDBEntity<string>>;

package/dist/validation/joi/joi.validation.util.d.ts

@@ -1,5 +1,4 @@
-import { ValidationOptions } from 'joi';
-import { AnySchemaTyped } from './joi.model';
+import { AnySchema, ValidationOptions } from 'joi';
 import { JoiValidationError } from './joi.validation.error';
 export interface JoiValidationResult<T = any> {
     value: T;
@@ -12,7 +11,7 @@ export interface JoiValidationResult<T = any> {
  *
  * If `schema` is undefined - returns value as is.
  */
-export declare function validate<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>, objectName?: string, options?: ValidationOptions): OUT;
+export declare function validate<T>(value: T, schema?: AnySchema<T>, objectName?: string, options?: ValidationOptions): T;
 /**
  * Validates with Joi.
  * Returns JoiValidationResult with converted value and error (if any).
@@ -20,15 +19,15 @@ export declare function validate<IN, OUT = IN>(value: IN, schema?: AnySchemaType
  *
  * If `schema` is undefined - returns value as is.
  */
-export declare function getValidationResult<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>, objectName?: string, options?: ValidationOptions): JoiValidationResult<OUT>;
+export declare function getValidationResult<T>(value: T, schema?: AnySchema<T>, objectName?: string, options?: ValidationOptions): JoiValidationResult<T>;
 /**
  * Convenience function that returns true if !error.
  */
-export declare function isValid<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>): boolean;
-export declare function undefinedIfInvalid<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>): OUT | undefined;
+export declare function isValid<T>(value: T, schema?: AnySchema<T>): boolean;
+export declare function undefinedIfInvalid<T>(value: T, schema?: AnySchema<T>): T | undefined;
 /**
  * Will do joi-convertation, regardless of error/validity of value.
  *
  * @returns converted value
  */
-export declare function convert<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>): OUT;
+export declare function convert<T>(value: T, schema?: AnySchema<T>): T;

package/dist/validation/joi/number.extensions.d.ts

@@ -1,7 +1,6 @@
 import * as Joi from 'joi';
 import { Extension, NumberSchema } from 'joi';
-import { AnySchemaTyped } from './joi.model';
-export interface ExtendedNumberSchema extends NumberSchema, AnySchemaTyped<number> {
+export interface ExtendedNumberSchema<TSchema = number> extends NumberSchema<TSchema> {
     dividable: (q: number) => this;
 }
 export declare function numberExtensions(joi: typeof Joi): Extension;

package/dist/validation/joi/string.extensions.d.ts

@@ -1,7 +1,6 @@
 import { Extension, StringSchema } from 'joi';
 import * as Joi from 'joi';
-import { AnySchemaTyped } from './joi.model';
-export interface ExtendedStringSchema extends StringSchema, AnySchemaTyped<string> {
+export interface ExtendedStringSchema<TSchema = string> extends StringSchema<TSchema> {
     dateString: (min?: string, max?: string) => this;
 }
 export interface JoiDateStringOptions {

package/dist/validation/joi/string.extensions.js

@@ -24,14 +24,14 @@ function stringExtensions(joi) {
                 args: [
                     {
                         name: 'min',
-                        ref: true,
-                        assert: v => typeof v === 'string',
+                        // ref: true, // check false
+                        assert: v => v === undefined || typeof v === 'string',
                         message: 'must be a string',
                     },
                     {
                         name: 'max',
-                        ref: true,
-                        assert: v => typeof v === 'string',
+                        // ref: true,
+                        assert: v => v === undefined || typeof v === 'string',
                         message: 'must be a string',
                     },
                 ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.101.2",
+  "version": "12.102.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -28,7 +28,7 @@
     "fast-glob": "^3.2.11",
     "globby": "^11.0.0",
     "got": "^11.0.1",
-    "joi": "17.4.2",
+    "joi": "^17.9.2",
     "jsonwebtoken": "^9.0.0",
     "lru-cache": "^10.0.0",
     "through2-concurrent": "^2.0.0",

package/src/index.ts

@@ -5,7 +5,19 @@ import * as globby from 'globby'
 import type { GlobbyOptions } from 'globby'
 import { RequestError, TimeoutError } from 'got'
 import type { AfterResponseHook, BeforeErrorHook, BeforeRequestHook, Got } from 'got'
-import type { AnySchema, ValidationErrorItem } from 'joi'
+import type {
+  AnySchema,
+  ValidationErrorItem,
+  AlternativesSchema,
+  ArraySchema,
+  BinarySchema,
+  BooleanSchema,
+  DateSchema,
+  FunctionSchema,
+  NumberSchema,
+  ObjectSchema,
+  StringSchema,
+} from 'joi'
 export * from './buffer/buffer.util'
 export * from './diff/tableDiff'
 export * from './got/getGot'
@@ -86,11 +98,20 @@ export type {
   GlobbyOptions,
   FastGlobOptions,
   ValidationErrorItem,
-  AnySchema,
   Got,
   AfterResponseHook,
   BeforeErrorHook,
   BeforeRequestHook,
+  AlternativesSchema,
+  AnySchema,
+  ArraySchema,
+  BinarySchema,
+  BooleanSchema,
+  DateSchema,
+  FunctionSchema,
+  NumberSchema,
+  ObjectSchema,
+  StringSchema,
 }
 
 export { globby, fastGlob, RequestError, TimeoutError, Ajv }

package/src/jwt/jwt.service.ts

@@ -1,7 +1,7 @@
 import { _assert, _errorDataAppend, AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib'
+import { AnySchema } from 'joi'
 import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken'
 import * as jsonwebtoken from 'jsonwebtoken'
-import { AnySchemaTyped } from '../validation/joi/joi.model'
 import { anyObjectSchema } from '../validation/joi/joi.shared.schemas'
 import { validate } from '../validation/joi/joi.validation.util'
 export { jsonwebtoken }
@@ -62,11 +62,7 @@ export interface JWTServiceCfg {
 export class JWTService {
   constructor(public cfg: JWTServiceCfg) {}
 
-  sign<T extends AnyObject>(
-    payload: T,
-    schema?: AnySchemaTyped<T>,
-    opt: SignOptions = {},
-  ): JWTString {
+  sign<T extends AnyObject>(payload: T, schema?: AnySchema<T>, opt: SignOptions = {}): JWTString {
     _assert(
       this.cfg.privateKey,
       'JWTService: privateKey is required to be able to verify, but not provided',
@@ -86,7 +82,7 @@ export class JWTService {
 
   verify<T extends AnyObject>(
     token: JWTString,
-    schema?: AnySchemaTyped<T>,
+    schema?: AnySchema<T>,
     opt: VerifyOptions = {},
     publicKey?: string, // allows to override public key
   ): T {
@@ -119,7 +115,7 @@ export class JWTService {
 
   decode<T extends AnyObject>(
     token: JWTString,
-    schema?: AnySchemaTyped<T>,
+    schema?: AnySchema<T>,
   ): {
     header: JwtHeader
     payload: T

package/src/validation/joi/joi.extensions.ts

@@ -5,9 +5,9 @@ import { ExtendedStringSchema, stringExtensions } from './string.extensions'
 
 export interface ExtendedJoi extends JoiLib.Root {
   // eslint-disable-next-line id-blacklist
-  string: () => ExtendedStringSchema
+  string: <TSchema = string>() => ExtendedStringSchema<TSchema>
   // eslint-disable-next-line id-blacklist
-  number: () => ExtendedNumberSchema
+  number: <TSchema = number>() => ExtendedNumberSchema<TSchema>
 }
 
 /**

package/src/validation/joi/joi.model.ts

@@ -1,48 +1,3 @@
-import {
-  AlternativesSchema,
-  AnySchema,
-  ArraySchema,
-  BinarySchema,
-  BooleanSchema,
-  DateSchema,
-  FunctionSchema,
-  NumberSchema,
-  ObjectSchema,
-  StringSchema,
-} from 'joi'
-
-/* eslint-disable unused-imports/no-unused-vars */
-
-export type SchemaTyped<IN, OUT = IN> =
-  | AnySchemaTyped<IN, OUT>
-  | ArraySchemaTyped<IN>
-  | AlternativesSchemaTyped<IN>
-  | BinarySchemaTyped
-  | BooleanSchemaTyped
-  | DateSchemaTyped<IN>
-  | FunctionSchemaTyped<IN>
-  | NumberSchemaTyped
-  | ObjectSchemaTyped<IN, OUT>
-  | StringSchemaTyped
-
-/**
- * IN - value before validation/conversion
- * OUT - value after validation/conversion (can be different due to conversion, stripping, etc)
- */
-export interface AnySchemaTyped<IN, OUT = IN> extends AnySchema {}
-
-export interface ArraySchemaTyped<T> extends ArraySchema, AnySchemaTyped<T[]> {}
-export interface AlternativesSchemaTyped<T> extends AlternativesSchema {}
-export interface BinarySchemaTyped extends BinarySchema, AnySchemaTyped<Buffer> {}
-export interface BooleanSchemaTyped extends BooleanSchema, AnySchemaTyped<boolean> {}
-export interface DateSchemaTyped<T> extends DateSchema {}
-export interface FunctionSchemaTyped<T> extends FunctionSchema {}
-export interface NumberSchemaTyped extends NumberSchema, AnySchemaTyped<number> {}
-export interface ObjectSchemaTyped<IN, OUT = IN>
-  extends ObjectSchema<IN>,
-    AnySchemaTyped<IN, OUT> {}
-export interface StringSchemaTyped extends StringSchema, AnySchemaTyped<string> {}
-
 /**
  * This type is useful to allow "joi schema merging".
  * Because by default Joi doesn't allow normal merging.

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

@@ -1,16 +1,10 @@
 import { BaseDBEntity, SavedDBEntity } from '@naturalcycles/js-lib'
+import { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi'
 import { Joi } from './joi.extensions'
-import {
-  AlternativesSchemaTyped,
-  AnySchemaTyped,
-  ArraySchemaTyped,
-  BooleanSchemaTyped,
-  ObjectSchemaTyped,
-  StringSchemaTyped,
-} from './joi.model'
-
-export const booleanSchema = Joi.boolean() as BooleanSchemaTyped
-export const booleanDefaultToFalseSchema = Joi.boolean().default(false) as BooleanSchemaTyped
+import { ExtendedStringSchema } from './string.extensions'
+
+export const booleanSchema = Joi.boolean()
+export const booleanDefaultToFalseSchema = Joi.boolean().default(false)
 export const stringSchema = Joi.string()
 export const numberSchema = Joi.number()
 export const integerSchema = Joi.number().integer()
@@ -19,22 +13,20 @@ export const dateStringSchema = stringSchema.dateString()
 export const binarySchema = Joi.binary()
 export const dateObjectSchema = Joi.object().instance(Date)
 
-export const urlSchema = (scheme: string | string[] = 'https'): StringSchemaTyped =>
+export const urlSchema = (scheme: string | string[] = 'https'): ExtendedStringSchema =>
   Joi.string().uri({ scheme })
 
-export function arraySchema<T>(items?: AnySchemaTyped<T, T>): ArraySchemaTyped<T> {
+export function arraySchema<T>(items?: AnySchema<T>): ArraySchema<T[]> {
   return items ? Joi.array().items(items) : Joi.array()
 }
 
-export function objectSchema<IN, OUT = IN>(schema?: {
-  [key in keyof Partial<IN>]: AnySchemaTyped<IN[key]>
-}): ObjectSchemaTyped<IN, OUT> {
+export function objectSchema<T>(schema?: {
+  [key in keyof Partial<T>]: AnySchema<T[key]>
+}): ObjectSchema<T> {
   return Joi.object(schema)
 }
 
-export function oneOfSchema<T = any>(
-  ...schemas: AnySchemaTyped<any>[]
-): AlternativesSchemaTyped<T> {
+export function oneOfSchema<T = any>(...schemas: AnySchema[]): AlternativesSchema<T> {
   return Joi.alternatives(schemas)
 }
 

package/src/validation/joi/joi.validation.util.ts

@@ -7,8 +7,7 @@
  */
 
 import { _hb, _isObject, _truncateMiddle } from '@naturalcycles/js-lib'
-import { ValidationError, ValidationOptions } from 'joi'
-import { AnySchemaTyped } from './joi.model'
+import { AnySchema, ValidationError, ValidationOptions } from 'joi'
 import { JoiValidationError, JoiValidationErrorData } from './joi.validation.error'
 
 // todo: consider replacing with Tuple of [error, value]
@@ -49,18 +48,13 @@ const defaultOptions: ValidationOptions = {
  *
  * If `schema` is undefined - returns value as is.
  */
-export function validate<IN, OUT = IN>(
-  value: IN,
-  schema?: AnySchemaTyped<IN, OUT>,
+export function validate<T>(
+  value: T,
+  schema?: AnySchema<T>,
   objectName?: string,
   options: ValidationOptions = {},
-): OUT {
-  const { value: returnValue, error } = getValidationResult<IN, OUT>(
-    value,
-    schema,
-    objectName,
-    options,
-  )
+): T {
+  const { value: returnValue, error } = getValidationResult(value, schema, objectName, options)
 
   if (error) {
     throw error
@@ -76,12 +70,12 @@ export function validate<IN, OUT = IN>(
  *
  * If `schema` is undefined - returns value as is.
  */
-export function getValidationResult<IN, OUT = IN>(
-  value: IN,
-  schema?: AnySchemaTyped<IN, OUT>,
+export function getValidationResult<T>(
+  value: T,
+  schema?: AnySchema<T>,
   objectName?: string,
   options: ValidationOptions = {},
-): JoiValidationResult<OUT> {
+): JoiValidationResult<T> {
   if (!schema) return { value } as any
 
   const { value: returnValue, error } = schema.validate(value, {
@@ -89,8 +83,8 @@ export function getValidationResult<IN, OUT = IN>(
     ...options,
   })
 
-  const vr: JoiValidationResult<OUT> = {
-    value: returnValue as OUT,
+  const vr: JoiValidationResult<T> = {
+    value: returnValue!,
   }
 
   if (error) {
@@ -103,17 +97,14 @@ export function getValidationResult<IN, OUT = IN>(
 /**
  * Convenience function that returns true if !error.
  */
-export function isValid<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>): boolean {
+export function isValid<T>(value: T, schema?: AnySchema<T>): boolean {
   if (!schema) return { value } as any
 
   const { error } = schema.validate(value, defaultOptions)
   return !error
 }
 
-export function undefinedIfInvalid<IN, OUT = IN>(
-  value: IN,
-  schema?: AnySchemaTyped<IN, OUT>,
-): OUT | undefined {
+export function undefinedIfInvalid<T>(value: T, schema?: AnySchema<T>): T | undefined {
   if (!schema) return { value } as any
 
   const { value: returnValue, error } = schema.validate(value, defaultOptions)
@@ -126,10 +117,10 @@ export function undefinedIfInvalid<IN, OUT = IN>(
  *
  * @returns converted value
  */
-export function convert<IN, OUT = IN>(value: IN, schema?: AnySchemaTyped<IN, OUT>): OUT {
+export function convert<T>(value: T, schema?: AnySchema<T>): T {
   if (!schema) return value as any
   const { value: returnValue } = schema.validate(value, defaultOptions)
-  return returnValue
+  return returnValue!
 }
 
 function createError(value: any, err: ValidationError, objectName?: string): JoiValidationError {

package/src/validation/joi/number.extensions.ts

@@ -1,8 +1,7 @@
 import * as Joi from 'joi'
 import { Extension, NumberSchema } from 'joi'
-import { AnySchemaTyped } from './joi.model'
 
-export interface ExtendedNumberSchema extends NumberSchema, AnySchemaTyped<number> {
+export interface ExtendedNumberSchema<TSchema = number> extends NumberSchema<TSchema> {
   dividable: (q: number) => this
 }
 

package/src/validation/joi/string.extensions.ts

@@ -1,9 +1,8 @@
 import { LocalDate, localTime } from '@naturalcycles/js-lib'
 import { Extension, StringSchema } from 'joi'
 import * as Joi from 'joi'
-import { AnySchemaTyped } from './joi.model'
 
-export interface ExtendedStringSchema extends StringSchema, AnySchemaTyped<string> {
+export interface ExtendedStringSchema<TSchema = string> extends StringSchema<TSchema> {
   dateString: (min?: string, max?: string) => this
 }
 
@@ -28,20 +27,20 @@ export function stringExtensions(joi: typeof Joi): Extension {
         method(min?: string, max?: string) {
           return this.$_addRule({
             name: 'dateString',
-            args: { min, max } as JoiDateStringOptions,
+            args: { min, max } satisfies JoiDateStringOptions,
           })
         },
         args: [
           {
             name: 'min',
-            ref: true,
-            assert: v => typeof v === 'string',
+            // ref: true, // check false
+            assert: v => v === undefined || typeof v === 'string',
             message: 'must be a string',
           },
           {
             name: 'max',
-            ref: true,
-            assert: v => typeof v === 'string',
+            // ref: true,
+            assert: v => v === undefined || typeof v === 'string',
             message: 'must be a string',
           },
         ],