@naturalcycles/nodejs-lib 12.41.0 → 12.42.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [12.42.0](https://github.com/NaturalCycles/nodejs-lib/compare/v12.41.0...v12.42.0) (2021-10-19)
+
+
+### Features
+
+* JoiValidationError to include full `annotation` ([c17756e](https://github.com/NaturalCycles/nodejs-lib/commit/c17756e1f8760987e62f6bee35f72fe7449b5671))
+
 # [12.41.0](https://github.com/NaturalCycles/nodejs-lib/compare/v12.40.0...v12.41.0) (2021-10-18)
 
 

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

@@ -14,6 +14,11 @@ export interface JoiValidationErrorData extends ErrorData {
     joiValidationErrorItems: ValidationErrorItem[];
     joiValidationObjectName?: string;
     joiValidationObjectId?: string;
+    /**
+     * Error "annotation" is stripped in Error.message.
+     * This field contains the "full" annotation.
+     */
+    annotation?: string;
 }
 export declare class JoiValidationError extends AppError<JoiValidationErrorData> {
     constructor(message: string, data: JoiValidationErrorData);

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

@@ -110,9 +110,9 @@ function createError(value, err, objectName) {
         tokens.push('Invalid ' + [objectName, objectId].filter(Boolean).join('.'));
     }
     const annotation = err.annotate(stripColors);
-    if (annotation.length > 2000) {
+    if (annotation.length > 4000) {
         // Annotation message is too big and will be replaced by stringified `error.details` instead
-        tokens.push(annotation.slice(0, 2000), `... ${Math.ceil(annotation.length / 1024)} KB message truncated`);
+        tokens.push((0, js_lib_1._truncateMiddle)(annotation, 4000, `\n... ${(0, js_lib_1._hb)(annotation.length)} message truncated ...\n`));
         // Up to 5 `details`
         tokens.push(...err.details.slice(0, 5).map(i => `${i.message} @ .${i.path.join('.')}`));
         if (err.details.length > 5)
@@ -126,5 +126,6 @@ function createError(value, err, objectName) {
         joiValidationErrorItems: err.details,
         ...(objectName && { joiValidationObjectName: objectName }),
         ...(objectId && { joiValidationObjectId: objectId }),
+        annotation,
     });
 }

package/package.json

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

package/src/validation/joi/joi.validation.error.ts

@@ -15,6 +15,11 @@ export interface JoiValidationErrorData extends ErrorData {
   joiValidationErrorItems: ValidationErrorItem[]
   joiValidationObjectName?: string
   joiValidationObjectId?: string
+  /**
+   * Error "annotation" is stripped in Error.message.
+   * This field contains the "full" annotation.
+   */
+  annotation?: string
 }
 
 export class JoiValidationError extends AppError<JoiValidationErrorData> {

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

@@ -6,7 +6,7 @@
  * "Converts" mean e.g trims all strings from leading/trailing spaces.
  */
 
-import { _isObject } from '@naturalcycles/js-lib'
+import { _hb, _isObject, _truncateMiddle } from '@naturalcycles/js-lib'
 import { ValidationError, ValidationOptions } from 'joi'
 import { AnySchemaTyped } from './joi.model'
 import { JoiValidationError } from './joi.validation.error'
@@ -146,11 +146,11 @@ function createError(value: any, err: ValidationError, objectName?: string): Joi
 
   const annotation = err.annotate(stripColors)
 
-  if (annotation.length > 2000) {
+  if (annotation.length > 4000) {
     // Annotation message is too big and will be replaced by stringified `error.details` instead
+
     tokens.push(
-      annotation.slice(0, 2000),
-      `... ${Math.ceil(annotation.length / 1024)} KB message truncated`,
+      _truncateMiddle(annotation, 4000, `\n... ${_hb(annotation.length)} message truncated ...\n`),
     )
 
     // Up to 5 `details`
@@ -167,5 +167,6 @@ function createError(value: any, err: ValidationError, objectName?: string): Joi
     joiValidationErrorItems: err.details,
     ...(objectName && { joiValidationObjectName: objectName }),
     ...(objectId && { joiValidationObjectId: objectId }),
+    annotation,
   })
 }