chore: Updated dependencies, code and tools.

Author: ShogunPanda

.github/workflows/ci.yml

@@ -6,13 +6,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Use Node.js LTS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 12.x
       - name: Restore cached dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: node-modules-${{ hashFiles('package.json') }}

README.md

@@ -3,7 +3,7 @@
 [![Package Version](https://img.shields.io/npm/v/fastify-http-errors-enhanced.svg)](https://npm.im/fastify-http-errors-enhanced)
 [![Dependency Status](https://img.shields.io/david/ShogunPanda/fastify-http-errors-enhanced)](https://david-dm.org/ShogunPanda/fastify-http-errors-enhanced)
 [![Build](https://github.com/ShogunPanda/fastify-http-errors-enhanced/workflows/CI/badge.svg)](https://github.com/ShogunPanda/fastify-http-errors-enhanced/actions?query=workflow%3ACI)
-[![Code Coverage](https://img.shields.io/codecov/c/gh/ShogunPanda/fastify-http-errors-enhanced?token=d0ae1643f35c4c4f9714a357f796d05d)](https://codecov.io/gh/ShogunPanda/fastify-http-errors-enhanced)
+[![Code Coverage](https://img.shields.io/codecov/c/gh/ShogunPanda/fastify-http-errors-enhanced?token=ep3IRURLnT)](https://codecov.io/gh/ShogunPanda/fastify-http-errors-enhanced)
 
 A error handling plugin for Fastify that uses enhanced HTTP errors.
 

lib/validation.js

@@ -87,6 +87,8 @@ function convertValidationErrors(section, data, validationErrors) {
         if (key.startsWith('.')) {
             key = key.substring(1);
         }
+        // Remove useless quotes
+        /* istanbul ignore next */
         if (key.startsWith('[') && key.endsWith(']')) {
             key = key.substring(1, key.length - 1);
         }
@@ -148,19 +150,17 @@ function convertValidationErrors(section, data, validationErrors) {
         if (!message.length) {
             message = `${e.message.replace(/^should/, 'must')} (${e.keyword})`;
         }
-        // Find the property to add
-        let property = key
-            .replace(/\[(\d+)\]/g, '.$1') // Array path
-            .replace(/\[([^\]]+)\]/g, '.$1'); // Object path
         // Remove useless quotes
-        if (property.match(/(?:^['"])(?:[^.]+)(?:['"]$)/)) {
-            property = property.substring(1, property.length - 1);
+        /* istanbul ignore next */
+        if (key.match(/(?:^['"])(?:[^.]+)(?:['"]$)/)) {
+            key = key.substring(1, key.length - 1);
         }
         // Fix empty properties
-        if (!property) {
-            property = '$root';
+        if (!key) {
+            key = '$root';
         }
-        errors[property] = message;
+        key = key.replace(/^\//, '');
+        errors[key] = message;
     }
     return { [section]: errors };
 }
@@ -213,8 +213,7 @@ function compileResponseValidationSchema() {
             removeAdditional: false,
             useDefaults: true,
             coerceTypes: false,
-            allErrors: true,
-            nullable: true
+            allErrors: true
         });
         compiler.addSchema(Object.values(instance.getSchemas()));
         for (const [code, schema] of schemas) {

package.json

@@ -37,18 +37,19 @@
     "postpublish": "git push origin && git push origin -f --tags"
   },
   "dependencies": {
-    "ajv": "^6.12.6",
+    "ajv": "^7.0.2",
     "fastify-plugin": "^3.0.0",
-    "http-errors-enhanced": "^0.5.0"
+    "http-errors-enhanced": "^0.5.2"
   },
   "devDependencies": {
     "@cowtech/eslint-config": "^7.10.1",
-    "@types/node": "^14.14.10",
+    "@types/node": "^14.14.19",
     "@types/tap": "^14.10.1",
-    "fastify": "^3.8.0",
+    "ajv-formats": "^1.5.1",
+    "fastify": "^3.9.2",
     "prettier": "^2.2.1",
     "tap": "^14.11.0",
-    "typescript": "^4.1.2"
+    "typescript": "^4.1.3"
   },
   "engines": {
     "node": ">=12.15.0"

src/interfaces.ts

@@ -1,4 +1,4 @@
-import { Ajv, ValidateFunction } from 'ajv'
+import Ajv, { ValidateFunction } from 'ajv'
 
 export const kHttpErrorsEnhancedProperties = Symbol('fastify-http-errors-enhanced-properties')
 export const kHttpErrorsEnhancedResponseValidations = Symbol('fastify-http-errors-enhanced-response-validation')

src/validation.ts

@@ -106,6 +106,8 @@ export function convertValidationErrors(
       key = key.substring(1)
     }
 
+    // Remove useless quotes
+    /* istanbul ignore next */
     if (key.startsWith('[') && key.endsWith(']')) {
       key = key.substring(1, key.length - 1)
     }
@@ -175,22 +177,20 @@ export function convertValidationErrors(
       message = `${e.message.replace(/^should/, 'must')} (${e.keyword})`
     }
 
-    // Find the property to add
-    let property = key
-      .replace(/\[(\d+)\]/g, '.$1') // Array path
-      .replace(/\[([^\]]+)\]/g, '.$1') // Object path
-
     // Remove useless quotes
-    if (property.match(/(?:^['"])(?:[^.]+)(?:['"]$)/)) {
-      property = property.substring(1, property.length - 1)
+    /* istanbul ignore next */
+    if (key.match(/(?:^['"])(?:[^.]+)(?:['"]$)/)) {
+      key = key.substring(1, key.length - 1)
     }
 
     // Fix empty properties
-    if (!property) {
-      property = '$root'
+    if (!key) {
+      key = '$root'
     }
 
-    errors[property] = message
+    key = key.replace(/^\//, '')
+
+    errors[key] = message
   }
 
   return { [section]: errors }
@@ -258,8 +258,7 @@ export function compileResponseValidationSchema(this: FastifyInstance): void {
       removeAdditional: false,
       useDefaults: true,
       coerceTypes: false,
-      allErrors: true,
-      nullable: true
+      allErrors: true
     })
 
     compiler.addSchema(Object.values(instance.getSchemas()))

test/index.test.ts

@@ -150,8 +150,7 @@ async function buildServer(options: FastifyPluginOptions = {}): Promise<FastifyI
         removeAdditional: false,
         useDefaults: true,
         coerceTypes: true,
-        allErrors: true,
-        nullable: true
+        allErrors: true
       }
     }
   })

test/validation.test.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-floating-promises */
 
 import Ajv from 'ajv'
+import addFormats from 'ajv-formats'
 import fastify, { FastifyInstance, FastifyPluginOptions, FastifyReply, FastifyRequest, ValidationResult } from 'fastify'
 import { ACCEPTED, INTERNAL_SERVER_ERROR, OK } from 'http-errors-enhanced'
 import t from 'tap'
@@ -146,20 +147,27 @@ t.test('Validation', (t: Test) => {
       useDefaults: true,
       coerceTypes: true,
       allErrors: true,
-      nullable: true,
       formats: {
-        invalidResponseCode(raw: number): boolean {
-          return raw < 100 && raw > 599
+        invalidResponseCode: {
+          validate(raw: number): boolean {
+            return raw < 100 && raw > 599
+          }
         },
-        invalidResponse(raw: number): boolean {
-          return raw < 100 && raw > 599
+        invalidResponse: {
+          validate(raw: number): boolean {
+            return raw < 100 && raw > 599
+          }
         },
-        noMessage(): boolean {
-          return false
+        noMessage: {
+          validate(): boolean {
+            return false
+          }
         }
       }
     })
 
+    addFormats(ajv)
+
     const schema = {
       type: 'object',
       properties: {
@@ -225,7 +233,7 @@ t.test('Validation', (t: Test) => {
         },
         pattern: {
           type: 'string',
-          pattern: '\\d+{a}abc'
+          pattern: '\\d+\\{a\\}abc'
         },
         uuid: {
           type: 'string',
@@ -337,17 +345,17 @@ t.test('Validation', (t: Test) => {
         emptyArray: 'must be a empty array',
         minItems: 'must be an array with at least 2 items',
         maxItems: 'must be an array with at most 2 items',
-        'arrayPath.0': 'must be a valid number',
-        "objectPath.'x-abc'": 'must be a valid number',
-        'objectPath.cde': 'must be a valid number',
+        'arrayPath/0': 'must be a valid number',
+        'objectPath/x-abc': 'must be a valid number',
+        'objectPath/cde': 'must be a valid number',
         minimum: 'must be a number greater than or equal to 5',
         maximum: 'must be a number less than or equal to 5',
         integer: 'must be a valid integer number',
         object: 'must be a object',
         number: 'must be a valid number',
         enum: 'must be one of the following values: "a", "b" or "c"',
         presentString: 'must be a non empty string',
-        pattern: 'must match pattern "\\d+{a}abc"',
+        pattern: 'must match pattern "\\d+\\{a\\}abc"',
         uuid: 'must be a valid GUID (UUID v4)',
         hostname: 'must be a valid hostname',
         ipv4: 'must be a valid IPv4',

types/interfaces.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Ajv, ValidateFunction } from 'ajv';
+import Ajv, { ValidateFunction } from 'ajv';
 export declare const kHttpErrorsEnhancedProperties: unique symbol;
 export declare const kHttpErrorsEnhancedResponseValidations: unique symbol;
 declare module 'fastify' {