@naturalcycles/nodejs-lib 15.89.1 → 15.90.1

package/dist/validation/ajv/ajvSchema.d.ts

@@ -1,6 +1,5 @@
 import { type ValidationFunction, type ValidationFunctionResult } from '@naturalcycles/js-lib';
 import { type AnyObject } from '@naturalcycles/js-lib/types';
-import type { ZodType } from '@naturalcycles/js-lib/zod';
 import type { Ajv } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
 import { type JsonSchema, JsonSchemaTerminal } from './jsonSchemaBuilder.js';
@@ -25,10 +24,6 @@ export declare class AjvSchema<IN = unknown, OUT = IN> {
      * correctly for some reason.
      */
     static create<IN, OUT = IN>(schema: SchemaHandledByAjv<IN, OUT>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<IN, OUT>;
-    /**
-     * @deprecated Use `j` to build schemas, not `z` or `zod`.
-     */
-    static createFromZod<T extends ZodType<any, any, any>>(schema: T): AjvSchema<T['_input'], T['_output']>;
     static isJsonSchemaBuilder<IN, OUT>(schema: unknown): schema is JsonSchemaTerminal<IN, OUT, any>;
     readonly cfg: AjvSchemaCfg;
     /**

package/dist/validation/ajv/ajvSchema.js

@@ -3,7 +3,6 @@ import { _assert } from '@naturalcycles/js-lib/error';
 import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object';
 import { _substringBefore } from '@naturalcycles/js-lib/string';
 import { _typeCast } from '@naturalcycles/js-lib/types';
-import { z } from '@naturalcycles/js-lib/zod';
 import { _inspect } from '../../string/inspect.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
@@ -70,15 +69,6 @@ export class AjvSchema {
         AjvSchema.cacheAjvSchema(schema, ajvSchema);
         return ajvSchema;
     }
-    /**
-     * @deprecated Use `j` to build schemas, not `z` or `zod`.
-     */
-    static createFromZod(schema) {
-        const jsonSchema = z.toJSONSchema(schema, {
-            target: 'draft-2020-12',
-        });
-        return AjvSchema.create(jsonSchema);
-    }
     static isJsonSchemaBuilder(schema) {
         return schema instanceof JsonSchemaTerminal;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.89.1",
+  "version": "15.90.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -10,7 +10,6 @@
     "ajv": "^8",
     "chalk": "^5",
     "dotenv": "^17",
-    "joi": "^18",
     "js-yaml": "^4",
     "jsonwebtoken": "^9",
     "lru-cache": "^11",
@@ -39,7 +38,6 @@
     "./stream/*.js": "./dist/stream/*.js",
     "./yargs": "./dist/yargs/yargs.util.js",
     "./ajv": "./dist/validation/ajv/index.js",
-    "./joi": "./dist/validation/joi/index.js",
     "./zip": "./dist/zip/zip.util.js"
   },
   "bin": {

package/src/validation/ajv/ajvSchema.ts

@@ -8,8 +8,6 @@ import { _assert } from '@naturalcycles/js-lib/error'
 import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object'
 import { _substringBefore } from '@naturalcycles/js-lib/string'
 import { _typeCast, type AnyObject } from '@naturalcycles/js-lib/types'
-import type { ZodType } from '@naturalcycles/js-lib/zod'
-import { z } from '@naturalcycles/js-lib/zod'
 import type { Ajv, ErrorObject } from 'ajv'
 import { _inspect } from '../../string/inspect.js'
 import { AjvValidationError } from './ajvValidationError.js'
@@ -93,19 +91,6 @@ export class AjvSchema<IN = unknown, OUT = IN> {
     return ajvSchema
   }
 
-  /**
-   * @deprecated Use `j` to build schemas, not `z` or `zod`.
-   */
-  static createFromZod<T extends ZodType<any, any, any>>(
-    schema: T,
-  ): AjvSchema<T['_input'], T['_output']> {
-    const jsonSchema = z.toJSONSchema(schema, {
-      target: 'draft-2020-12',
-    }) as unknown as JsonSchema<T['_input'], T['_output']>
-
-    return AjvSchema.create(jsonSchema)
-  }
-
   static isJsonSchemaBuilder<IN, OUT>(schema: unknown): schema is JsonSchemaTerminal<IN, OUT, any> {
     return schema instanceof JsonSchemaTerminal
   }

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

@@ -1,9 +0,0 @@
-import type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem } from 'joi';
-export * from './joi.extensions.js';
-export * from './joi.model.js';
-export * from './joi.shared.schemas.js';
-export * from './joi.validation.error.js';
-export * from './joi.validation.util.js';
-export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem, };
-export type { NumberSchema } from './number.extensions.js';
-export type { StringSchema } from './string.extensions.js';

package/dist/validation/joi/index.js

@@ -1,5 +0,0 @@
-export * from './joi.extensions.js';
-export * from './joi.model.js';
-export * from './joi.shared.schemas.js';
-export * from './joi.validation.error.js';
-export * from './joi.validation.util.js';

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

@@ -1,11 +0,0 @@
-import JoiLib from 'joi';
-import type { NumberSchema } from './number.extensions.js';
-import type { StringSchema } from './string.extensions.js';
-export interface ExtendedJoi extends JoiLib.Root {
-    string: <TSchema = string>() => StringSchema<TSchema>;
-    number: <TSchema = number>() => NumberSchema<TSchema>;
-}
-/**
- * This is the only right place to import Joi from
- */
-export declare const Joi: ExtendedJoi;

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

@@ -1,25 +0,0 @@
-import JoiLib from 'joi';
-import { numberExtensions } from './number.extensions.js';
-import { stringExtensions } from './string.extensions.js';
-/**
- * This is the only right place to import Joi from
- */
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const Joi = JoiLib.defaults(schema => {
-    // hack to prevent infinite recursion due to .empty('') where '' is a stringSchema itself
-    if (schema.type === 'string') {
-        return (schema
-            .trim() // trim all strings by default
-            // 2020-09-21: null values are NOT treated as EMPTY enymore
-            // .empty([schema.valid('', null)]) // treat '' or null as empty (undefined, will be stripped out)
-            // treat '' as empty (undefined, will be stripped out)
-            .empty([schema.valid('')]));
-    }
-    // Treat `null` as undefined for all schema types
-    // undefined values will be stripped by default from object values
-    // 2020-09-21: breaking change: null values are NOT treated as EMPTY anymore
-    // return schema.empty(null)
-    return schema;
-})
-    .extend((joi) => stringExtensions(joi))
-    .extend((joi) => numberExtensions(joi));

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

@@ -1,7 +0,0 @@
-/**
- * This type is useful to allow "joi schema merging".
- * Because by default Joi doesn't allow normal merging.
- * E.g `joiSchema.concat` doesn't play well when some property exists
- * in both left and right side.
- */
-export type JoiSchemaObject<T> = Partial<Record<keyof T, any>>;

package/dist/validation/joi/joi.model.js

@@ -1,5 +0,0 @@
-// export interface ObjectSchema<T = any> extends JoiObjectSchema<T> {
-//   // Open-ended index signature to allow for easier .concat(baseDBEntitySchema)
-//   [k: string]: any
-// }
-export {};

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

@@ -1,91 +0,0 @@
-import { type AnyObject, type BaseDBEntity, type IANATimezone, type IsoDate, type IsoDateTime, type NumberEnum, type StringEnum, type StringMap, type UnixTimestamp, type 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';
-export declare const booleanSchema: import("joi").BooleanSchema<boolean>;
-export declare const booleanDefaultToFalseSchema: import("joi").BooleanSchema<boolean>;
-export declare const stringSchema: StringSchema<string>;
-export declare const stringSchemaTyped: <T>() => StringSchema<T>;
-export declare const numberSchema: NumberSchema<number>;
-export declare const numberSchemaTyped: <T>() => NumberSchema<T>;
-export declare const integerSchema: NumberSchema<number>;
-export declare const percentageSchema: NumberSchema<number>;
-export declare const dateStringSchema: StringSchema<IsoDate>;
-export declare const binarySchema: import("joi").BinarySchema<Buffer<ArrayBufferLike>>;
-export declare const dateObjectSchema: ObjectSchema<any>;
-export declare const dateIntervalStringSchema: StringSchema<string>;
-export declare const DATE_TIME_STRING_REGEX: RegExp;
-export declare const dateTimeStringSchema: StringSchema<IsoDateTime>;
-/**
- * Allows all values of a String Enum.
- */
-export declare const stringEnumValueSchema: <ENUM extends StringEnum>(en: ENUM) => StringSchema<ENUM[keyof ENUM]>;
-/**
- * Allows all keys of a String Enum.
- */
-export declare const stringEnumKeySchema: <ENUM extends StringEnum>(en: ENUM) => StringSchema;
-/**
- * Allows all values of a String Enum.
- */
-export declare const numberEnumValueSchema: <ENUM extends NumberEnum>(en: ENUM) => NumberSchema<ENUM[keyof ENUM]>;
-/**
- * Allows all keys of a Number Enum.
- */
-export declare const numberEnumKeySchema: <ENUM extends NumberEnum>(en: ENUM) => StringSchema;
-export declare const urlSchema: (scheme?: string | string[]) => StringSchema;
-export declare function arraySchema<T>(items: AnySchema<T>): ArraySchema<T[]>;
-export declare function anyObjectSchema<T extends AnyObject>(): ObjectSchema<T>;
-export declare function objectSchema<T extends AnyObject>(schema: {
-    [key in keyof Partial<T>]: AnySchema<T[key]>;
-}): ObjectSchema<T>;
-export declare function stringMapSchema<T>(key: AnySchema, value: AnySchema<T>): ObjectSchema<StringMap<T>>;
-export declare function oneOfSchema<T = any>(...schemas: AnySchema[]): AlternativesSchema<T>;
-export declare const anySchema: AnySchema<any>;
-export declare const base62Schema: StringSchema<string>;
-export declare const base64Schema: StringSchema<string>;
-export declare const base64UrlSchema: StringSchema<string>;
-export declare const jwtSchema: StringSchema<string>;
-/**
- * [a-zA-Z0-9_]*
- * 6-64 length
- */
-export declare const idSchema: StringSchema<string>;
-export declare const idBase62Schema: StringSchema<string>;
-export declare const idBase64Schema: StringSchema<string>;
-export declare const idBase64UrlSchema: StringSchema<string>;
-/**
- * "Slug" - a valid URL, filename, etc.
- */
-export declare const slugSchema: StringSchema<string>;
-/**
- * Between years 1970 and 2050
- */
-export declare const unixTimestampSchema: NumberSchema<UnixTimestamp>;
-/**
- * Between years 2000 and 2050
- */
-export declare const unixTimestamp2000Schema: NumberSchema<UnixTimestamp>;
-/**
- * Between years 1970 and 2050
- */
-export declare const unixTimestampMillisSchema: NumberSchema<UnixTimestampMillis>;
-/**
- * Between years 2000 and 2050
- */
-export declare const unixTimestampMillis2000Schema: NumberSchema<UnixTimestampMillis>;
-export declare const verSchema: NumberSchema<number>;
-/**
- * Be careful, by default emailSchema does TLD validation. To disable it - use `stringSchema.email({tld: false}).lowercase()`
- */
-export declare const emailSchema: StringSchema<string>;
-/**
- * Pattern is simplified for our use, it's not a canonical SemVer.
- */
-export declare const semVerSchema: StringSchema<string>;
-export declare const userAgentSchema: StringSchema<string>;
-export declare const utcOffsetSchema: NumberSchema<number>;
-export declare const ianaTimezoneSchema: StringSchema<IANATimezone>;
-export declare const ipAddressSchema: StringSchema<string>;
-export declare const baseDBEntitySchema: ObjectSchema<BaseDBEntity>;
-export declare const macAddressSchema: StringSchema<string>;
-export declare const uuidSchema: StringSchema<string>;

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,135 +0,0 @@
-import { _numberEnumKeys, _numberEnumValues, _stringEnumKeys, _stringEnumValues, } from '@naturalcycles/js-lib';
-import { JWT_REGEX, } from '@naturalcycles/js-lib/types';
-import { BASE62_REGEX, BASE64_REGEX, BASE64URL_REGEX, ID_REGEX, MAC_ADDRESS_REGEX, SEMVER_REGEX, SLUG_REGEX, } from '../regexes.js';
-import { Joi } from './joi.extensions.js';
-export const booleanSchema = Joi.boolean();
-export const booleanDefaultToFalseSchema = Joi.boolean().default(false);
-export const stringSchema = Joi.string();
-export const stringSchemaTyped = () => Joi.string();
-export const numberSchema = Joi.number();
-export const numberSchemaTyped = () => Joi.number();
-export const integerSchema = Joi.number().integer();
-export const percentageSchema = Joi.number().integer().min(0).max(100);
-export const dateStringSchema = stringSchema.dateString();
-export const binarySchema = Joi.binary();
-export const dateObjectSchema = Joi.object().instance(Date);
-const DATE_INTERVAL_REGEX = /^\d{4}-\d{2}-\d{2}\/\d{4}-\d{2}-\d{2}$/;
-export const dateIntervalStringSchema = stringSchema.regex(DATE_INTERVAL_REGEX).messages({
-    'string.pattern.base': `must be a DateInterval string`,
-});
-export const DATE_TIME_STRING_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?(?:Z|[+-]\d{2}:\d{2})?)?$/;
-export const dateTimeStringSchema = stringSchema.regex(DATE_TIME_STRING_REGEX).messages({
-    'string.pattern.base': `must be a DateTime string`,
-});
-/**
- * Allows all values of a String Enum.
- */
-export const stringEnumValueSchema = (en) => Joi.string().valid(..._stringEnumValues(en));
-/**
- * Allows all keys of a String Enum.
- */
-export const stringEnumKeySchema = (en) => Joi.string().valid(..._stringEnumKeys(en));
-/**
- * Allows all values of a String Enum.
- */
-export const numberEnumValueSchema = (en) => Joi.number().valid(..._numberEnumValues(en));
-/**
- * Allows all keys of a Number Enum.
- */
-export const numberEnumKeySchema = (en) => Joi.string().valid(..._numberEnumKeys(en));
-export const urlSchema = (scheme = 'https') => Joi.string().uri({ scheme });
-export function arraySchema(items) {
-    return Joi.array().items(items);
-}
-export function anyObjectSchema() {
-    return Joi.object().options({ stripUnknown: false });
-}
-export function objectSchema(schema) {
-    return Joi.object(schema);
-}
-export function stringMapSchema(key, value) {
-    return Joi.object().pattern(key, value);
-}
-export function oneOfSchema(...schemas) {
-    return Joi.alternatives(schemas);
-}
-export const anySchema = Joi.any();
-export const base62Schema = stringSchema.regex(BASE62_REGEX);
-export const base64Schema = stringSchema.regex(BASE64_REGEX);
-export const base64UrlSchema = stringSchema.regex(BASE64URL_REGEX);
-export const jwtSchema = stringSchema.regex(JWT_REGEX);
-// 1g498efj5sder3324zer
-/**
- * [a-zA-Z0-9_]*
- * 6-64 length
- */
-export const idSchema = stringSchema.regex(ID_REGEX);
-export const idBase62Schema = base62Schema.min(8).max(64);
-export const idBase64Schema = base64Schema.min(8).max(64);
-export const idBase64UrlSchema = base64UrlSchema.min(8).max(64);
-/**
- * "Slug" - a valid URL, filename, etc.
- */
-export const slugSchema = stringSchema.regex(SLUG_REGEX).min(1).max(255);
-const TS_2500 = 16725225600; // 2500-01-01
-const TS_2000 = 946684800; // 2000-01-01
-/**
- * Between years 1970 and 2050
- */
-export const unixTimestampSchema = numberSchema
-    .integer()
-    .min(0)
-    .max(TS_2500);
-/**
- * Between years 2000 and 2050
- */
-export const unixTimestamp2000Schema = numberSchema
-    .integer()
-    .min(TS_2000)
-    .max(TS_2500);
-/**
- * Between years 1970 and 2050
- */
-export const unixTimestampMillisSchema = numberSchema
-    .integer()
-    .min(0)
-    .max(TS_2500 * 1000);
-/**
- * Between years 2000 and 2050
- */
-export const unixTimestampMillis2000Schema = numberSchema
-    .integer()
-    .min(TS_2000 * 1000)
-    .max(TS_2500 * 1000);
-// 2
-export const verSchema = numberSchema.optional().integer().min(1).max(100);
-/**
- * Be careful, by default emailSchema does TLD validation. To disable it - use `stringSchema.email({tld: false}).lowercase()`
- */
-export const emailSchema = stringSchema.email().lowercase();
-/**
- * Pattern is simplified for our use, it's not a canonical SemVer.
- */
-export const semVerSchema = stringSchema.regex(SEMVER_REGEX);
-// todo: .error(() => 'should be SemVer')
-export const userAgentSchema = stringSchema
-    .min(5) // I've seen UA of `Android` (7 characters)
-    .max(400);
-export const utcOffsetSchema = numberSchema
-    .min(-14 * 60)
-    .max(14 * 60)
-    .dividable(15);
-export const ianaTimezoneSchema = stringSchema
-    // UTC is added to assist unit-testing, which uses UTC by default (not technically a valid Iana timezone identifier)
-    .valid(...Intl.supportedValuesOf('timeZone'), 'UTC')
-    .messages({
-    'any.only': `must be a valid IANA timezone string`,
-});
-export const ipAddressSchema = stringSchema.ip();
-export const baseDBEntitySchema = objectSchema({
-    id: stringSchema.optional(),
-    created: unixTimestamp2000Schema.optional(),
-    updated: unixTimestamp2000Schema.optional(),
-});
-export const macAddressSchema = stringSchema.regex(MAC_ADDRESS_REGEX);
-export const uuidSchema = stringSchema.uuid();

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

@@ -1,29 +0,0 @@
-import type { ErrorData } from '@naturalcycles/js-lib/error';
-import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
-import type { ValidationErrorItem } from 'joi';
-/**
- * Example of ValidationErrorItem:
- *
- * {
- *   message: '"temperature" must be larger than or equal to 33',
- *   path: [ 'entries', 10, 'temperature' ],
- *   type: 'number.min',
- *   context: { limit: 33, value: 30, key: 'temperature', label: 'temperature' }
- * }
- */
-export interface JoiValidationErrorData extends ErrorData {
-    joiValidationErrorItems: ValidationErrorItem[];
-    joiValidationInputName?: string;
-    joiValidationInputId?: string;
-    /**
-     * Error "annotation" is stripped in Error.message.
-     * This field contains the "full" annotation.
-     *
-     * This field is non-enumerable, won't be printed or included in JSON by default,
-     * but still accessible programmatically (via `err.data.annotation`) when needed!
-     */
-    annotation?: string;
-}
-export declare class JoiValidationError extends AppError<JoiValidationErrorData> {
-    constructor(message: string, data: JoiValidationErrorData);
-}

package/dist/validation/joi/joi.validation.error.js

@@ -1,8 +0,0 @@
-import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
-export class JoiValidationError extends AppError {
-    constructor(message, data) {
-        super(message, data, {
-            name: 'JoiValidationError',
-        });
-    }
-}

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

@@ -1,33 +0,0 @@
-import { type ValidationFunction, type ValidationFunctionResult } from '@naturalcycles/js-lib';
-import type { AnySchema, ValidationOptions } from 'joi';
-import { JoiValidationError } from './joi.validation.error.js';
-export declare function getJoiValidationFunction<T>(schema: AnySchema<T>): ValidationFunction<T, T, JoiValidationError>;
-/**
- * Validates with Joi.
- * Throws JoiValidationError if invalid.
- * Returns *converted* value.
- *
- * If `schema` is undefined - returns value as is.
- */
-export declare function validate<T>(input: any, schema?: AnySchema<T>, inputName?: string, opt?: ValidationOptions): T;
-/**
- * Validates with Joi.
- * Returns JoiValidationResult with converted value and error (if any).
- * Does not throw.
- *
- * Joi does NOT mutate the input.
- *
- * If `schema` is undefined - returns value as is.
- */
-export declare function getValidationResult<T>(input: T, schema?: AnySchema<T>, inputName?: string, options?: ValidationOptions): ValidationFunctionResult<T, JoiValidationError>;
-/**
- * Convenience function that returns true if !error.
- */
-export declare function isValid<T>(input: T, schema?: AnySchema<T>): boolean;
-export declare function undefinedIfInvalid<T>(input: any, schema?: AnySchema<T>): T | undefined;
-/**
- * Will do joi-conversion, regardless of error/validity of value.
- *
- * @returns converted value
- */
-export declare function convert<T>(input: any, schema?: AnySchema<T>): T;

package/dist/validation/joi/joi.validation.util.js

@@ -1,139 +0,0 @@
-/*
- * Does 2 things:
- * 1. Validates the value according to Schema passed.
- * 2. Converts the value (also according to Schema).
- *
- * "Converts" mean e.g trims all strings from leading/trailing spaces.
- */
-import { _hb, _isObject, } from '@naturalcycles/js-lib';
-import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { _truncateMiddle } from '@naturalcycles/js-lib/string/string.util.js';
-import { JoiValidationError } from './joi.validation.error.js';
-// Strip colors in production (for e.g Sentry reporting)
-// const stripColors = process.env.NODE_ENV === 'production' || !!process.env.GAE_INSTANCE
-// Currently colors do more bad than good, so let's strip them always for now
-const stripColors = true;
-const defaultOptions = {
-    abortEarly: false,
-    convert: true,
-    allowUnknown: true,
-    stripUnknown: {
-        objects: true,
-        // true: it will SILENTLY strip invalid values from arrays. Very dangerous! Can lead to data loss!
-        // false: it will THROW validation error if any of array items is invalid
-        // Q: is it invalid if it has unknown properties?
-        // A: no, unknown properties are just stripped (in both 'false' and 'true' states), array is still valid
-        // Q: will it strip or keep unknown properties in array items?..
-        // A: strip
-        arrays: false, // let's be very careful with that! https://github.com/hapijs/joi/issues/658
-    },
-    presence: 'required',
-    // errors: {
-    //   stack: true,
-    // }
-};
-export function getJoiValidationFunction(schema) {
-    return (input, opt) => {
-        _assert(!opt?.mutateInput, 'mutateInput=true is not yet supported with Joi');
-        return getValidationResult(input, schema, opt?.inputName);
-    };
-}
-/**
- * Validates with Joi.
- * Throws JoiValidationError if invalid.
- * Returns *converted* value.
- *
- * If `schema` is undefined - returns value as is.
- */
-export function validate(input, schema, inputName, opt = {}) {
-    const [error, returnValue] = getValidationResult(input, schema, inputName, opt);
-    if (error)
-        throw error;
-    return returnValue;
-}
-/**
- * Validates with Joi.
- * Returns JoiValidationResult with converted value and error (if any).
- * Does not throw.
- *
- * Joi does NOT mutate the input.
- *
- * If `schema` is undefined - returns value as is.
- */
-export function getValidationResult(input, schema, inputName, options = {}) {
-    if (!schema)
-        return [null, input];
-    const { value, error } = schema.validate(input, {
-        ...defaultOptions,
-        ...options,
-    });
-    const err = error ? createError(input, error, inputName) : null;
-    return [err, value];
-}
-/**
- * Convenience function that returns true if !error.
- */
-export function isValid(input, schema) {
-    if (!schema)
-        return true;
-    const { error } = schema.validate(input, defaultOptions);
-    return !error;
-}
-export function undefinedIfInvalid(input, schema) {
-    if (!schema)
-        return input;
-    const { value, error } = schema.validate(input, defaultOptions);
-    return error ? undefined : value;
-}
-/**
- * Will do joi-conversion, regardless of error/validity of value.
- *
- * @returns converted value
- */
-export function convert(input, schema) {
-    if (!schema)
-        return input;
-    const { value } = schema.validate(input, defaultOptions);
-    return value;
-}
-function createError(value, err, inputName) {
-    const tokens = [];
-    const inputId = _isObject(value) ? value['id'] : undefined;
-    if (inputId || inputName) {
-        inputName ||= value?.constructor?.name;
-        tokens.push('Invalid ' + [inputName, inputId].filter(Boolean).join('.'));
-    }
-    const annotation = err.annotate(stripColors);
-    if (annotation.length > 100) {
-        // For rather large annotations - we include up to 5 errors up front, before printing the whole object.
-        // Up to 5 `details`
-        tokens.push(...err.details.slice(0, 5).map(i => {
-            return i.message;
-            // Currently not specifying the path, to not "overwhelm" the message
-            // Can be reverted if needed.
-            // let msg = i.message
-            // const paths = i.path.filter(Boolean).join('.')
-            // if (paths) msg += ` @ .${paths}`
-            // return msg
-        }));
-        if (err.details.length > 5)
-            tokens.push(`... ${err.details.length} errors in total`);
-        tokens.push('');
-    }
-    tokens.push(_truncateMiddle(annotation, 4000, `\n... ${_hb(annotation.length)} message truncated ...\n`));
-    const msg = tokens.join('\n');
-    const data = {
-        joiValidationErrorItems: err.details,
-        ...(inputName && { joiValidationInputName: inputName }),
-        ...(inputId && { joiValidationInputId: inputId }),
-    };
-    // Make annotation non-enumerable, to not get it automatically printed,
-    // but still accessible
-    Object.defineProperty(data, 'annotation', {
-        writable: true,
-        configurable: true,
-        enumerable: false,
-        value: annotation,
-    });
-    return new JoiValidationError(msg, data);
-}

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

@@ -1,6 +0,0 @@
-import type Joi from 'joi';
-import type { Extension, NumberSchema as JoiNumberSchema } from 'joi';
-export interface NumberSchema<TSchema = number> extends JoiNumberSchema<TSchema> {
-    dividable: (q: number) => this;
-}
-export declare function numberExtensions(joi: typeof Joi): Extension;

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

@@ -1,38 +0,0 @@
-export function numberExtensions(joi) {
-    return {
-        base: joi.number(),
-        type: 'number',
-        messages: {
-            'number.dividable': `"{{#label}}" must be dividable by {{#q}}`,
-        },
-        // validate (v, helpers) {
-        //   console.log('number validate called', {v})
-        // },
-        rules: {
-            // Based on: https://github.com/hapijs/joi/blob/master/API.md#extensions
-            dividable: {
-                multi: true,
-                method(q) {
-                    return this.$_addRule({
-                        name: 'dividable',
-                        args: { q },
-                    });
-                },
-                args: [
-                    {
-                        name: 'q',
-                        ref: true,
-                        assert: v => typeof v === 'number' && !Number.isNaN(v),
-                        message: 'must be a number',
-                    },
-                ],
-                validate(v, helpers, args) {
-                    if (v % args['q'] === 0) {
-                        return v;
-                    }
-                    return helpers.error('number.dividable', args);
-                },
-            },
-        },
-    };
-}

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

@@ -1,11 +0,0 @@
-import type { IsoDate } from '@naturalcycles/js-lib/types';
-import type Joi from 'joi';
-import type { Extension, StringSchema as JoiStringSchema } from 'joi';
-export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
-    dateString: (min?: IsoDate | 'today', max?: IsoDate | 'today') => StringSchema<IsoDate>;
-}
-export interface JoiDateStringOptions {
-    min?: IsoDate | 'today';
-    max?: IsoDate | 'today';
-}
-export declare function stringExtensions(joi: typeof Joi): Extension;