@naturalcycles/nodejs-lib 13.1.3 → 13.1.4

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

@@ -11,7 +11,7 @@ export interface JoiValidationResult<T = any> {
  *
  * If `schema` is undefined - returns value as is.
  */
-export declare function validate<T>(value: T, schema?: AnySchema<T>, objectName?: string, options?: ValidationOptions): T;
+export declare function validate<T>(input: any, schema?: AnySchema<T>, objectName?: string, opt?: ValidationOptions): T;
 /**
  * Validates with Joi.
  * Returns JoiValidationResult with converted value and error (if any).
@@ -19,15 +19,15 @@ export declare function validate<T>(value: T, schema?: AnySchema<T>, objectName?
  *
  * If `schema` is undefined - returns value as is.
  */
-export declare function getValidationResult<T>(value: T, schema?: AnySchema<T>, objectName?: string, options?: ValidationOptions): JoiValidationResult<T>;
+export declare function getValidationResult<T>(input: any, schema?: AnySchema<T>, objectName?: string, options?: ValidationOptions): JoiValidationResult<T>;
 /**
  * Convenience function that returns true if !error.
  */
-export declare function isValid<T>(value: T, schema?: AnySchema<T>): boolean;
-export declare function undefinedIfInvalid<T>(value: T, schema?: AnySchema<T>): T | undefined;
+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-convertation, regardless of error/validity of value.
+ * Will do joi-conversion, regardless of error/validity of value.
  *
  * @returns converted value
  */
-export declare function convert<T>(value: T, schema?: AnySchema<T>): T;
+export declare function convert<T>(input: any, schema?: AnySchema<T>): T;

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

@@ -40,8 +40,8 @@ const defaultOptions = {
  *
  * If `schema` is undefined - returns value as is.
  */
-function validate(value, schema, objectName, options = {}) {
-    const { value: returnValue, error } = getValidationResult(value, schema, objectName, options);
+function validate(input, schema, objectName, opt = {}) {
+    const { value: returnValue, error } = getValidationResult(input, schema, objectName, opt);
     if (error) {
         throw error;
     }
@@ -55,18 +55,18 @@ exports.validate = validate;
  *
  * If `schema` is undefined - returns value as is.
  */
-function getValidationResult(value, schema, objectName, options = {}) {
+function getValidationResult(input, schema, objectName, options = {}) {
     if (!schema)
-        return { value };
-    const { value: returnValue, error } = schema.validate(value, {
+        return { value: input };
+    const { value, error } = schema.validate(input, {
         ...defaultOptions,
         ...options,
     });
     const vr = {
-        value: returnValue,
+        value,
     };
     if (error) {
-        vr.error = createError(value, error, objectName);
+        vr.error = createError(input, error, objectName);
     }
     return vr;
 }
@@ -74,35 +74,33 @@ exports.getValidationResult = getValidationResult;
 /**
  * Convenience function that returns true if !error.
  */
-function isValid(value, schema) {
+function isValid(input, schema) {
     if (!schema)
-        return { value };
-    const { error } = schema.validate(value, defaultOptions);
+        return true;
+    const { error } = schema.validate(input, defaultOptions);
     return !error;
 }
 exports.isValid = isValid;
-function undefinedIfInvalid(value, schema) {
+function undefinedIfInvalid(input, schema) {
     if (!schema)
-        return { value };
-    const { value: returnValue, error } = schema.validate(value, defaultOptions);
-    return error ? undefined : returnValue;
+        return input;
+    const { value, error } = schema.validate(input, defaultOptions);
+    return error ? undefined : value;
 }
 exports.undefinedIfInvalid = undefinedIfInvalid;
 /**
- * Will do joi-convertation, regardless of error/validity of value.
+ * Will do joi-conversion, regardless of error/validity of value.
  *
  * @returns converted value
  */
-function convert(value, schema) {
+function convert(input, schema) {
     if (!schema)
-        return value;
-    const { value: returnValue } = schema.validate(value, defaultOptions);
-    return returnValue;
+        return input;
+    const { value } = schema.validate(input, defaultOptions);
+    return value;
 }
 exports.convert = convert;
 function createError(value, err, objectName) {
-    if (!err)
-        return undefined;
     const tokens = [];
     const objectId = (0, js_lib_1._isObject)(value) ? value['id'] : undefined;
     if (objectId || objectName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.1.3",
+  "version": "13.1.4",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

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

@@ -49,12 +49,12 @@ const defaultOptions: ValidationOptions = {
  * If `schema` is undefined - returns value as is.
  */
 export function validate<T>(
-  value: T,
+  input: any,
   schema?: AnySchema<T>,
   objectName?: string,
-  options: ValidationOptions = {},
+  opt: ValidationOptions = {},
 ): T {
-  const { value: returnValue, error } = getValidationResult(value, schema, objectName, options)
+  const { value: returnValue, error } = getValidationResult(input, schema, objectName, opt)
 
   if (error) {
     throw error
@@ -71,24 +71,24 @@ export function validate<T>(
  * If `schema` is undefined - returns value as is.
  */
 export function getValidationResult<T>(
-  value: T,
+  input: any,
   schema?: AnySchema<T>,
   objectName?: string,
   options: ValidationOptions = {},
 ): JoiValidationResult<T> {
-  if (!schema) return { value } as any
+  if (!schema) return { value: input }
 
-  const { value: returnValue, error } = schema.validate(value, {
+  const { value, error } = schema.validate(input, {
     ...defaultOptions,
     ...options,
   })
 
   const vr: JoiValidationResult<T> = {
-    value: returnValue,
+    value,
   }
 
   if (error) {
-    vr.error = createError(value, error, objectName)
+    vr.error = createError(input, error, objectName)
   }
 
   return vr
@@ -97,34 +97,33 @@ export function getValidationResult<T>(
 /**
  * Convenience function that returns true if !error.
  */
-export function isValid<T>(value: T, schema?: AnySchema<T>): boolean {
-  if (!schema) return { value } as any
+export function isValid<T>(input: T, schema?: AnySchema<T>): boolean {
+  if (!schema) return true
 
-  const { error } = schema.validate(value, defaultOptions)
+  const { error } = schema.validate(input, defaultOptions)
   return !error
 }
 
-export function undefinedIfInvalid<T>(value: T, schema?: AnySchema<T>): T | undefined {
-  if (!schema) return { value } as any
+export function undefinedIfInvalid<T>(input: any, schema?: AnySchema<T>): T | undefined {
+  if (!schema) return input
 
-  const { value: returnValue, error } = schema.validate(value, defaultOptions)
+  const { value, error } = schema.validate(input, defaultOptions)
 
-  return error ? undefined : returnValue
+  return error ? undefined : value
 }
 
 /**
- * Will do joi-convertation, regardless of error/validity of value.
+ * Will do joi-conversion, regardless of error/validity of value.
  *
  * @returns converted value
  */
-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
+export function convert<T>(input: any, schema?: AnySchema<T>): T {
+  if (!schema) return input
+  const { value } = schema.validate(input, defaultOptions)
+  return value
 }
 
 function createError(value: any, err: ValidationError, objectName?: string): JoiValidationError {
-  if (!err) return undefined as any
   const tokens: string[] = []
 
   const objectId = _isObject(value) ? (value['id'] as string) : undefined