chore: Updated build system.

Author: ShogunPanda

package.json

@@ -28,33 +28,37 @@
   "typings": "./types/index.d.ts",
   "types": "./types/index.d.ts",
   "scripts": {
-    "prebuild": "rm -rf dist types && npm run lint",
-    "build": "tsc -p . && esm-pkg-add-imports-extensions dist",
+    "dev": "swc -w -d dist src",
+    "prebuild": "rm -rf dist types && npm run typecheck && npm run lint",
+    "build": "swc --delete-dir-on-start -d dist src",
     "format": "prettier -w src test",
+    "typecheck": "tsc -p . --emitDeclarationOnly",
     "lint": "eslint src test",
-    "test": "c8 --reporter=text --reporter=html esm-ts-tap --reporter=spec --no-coverage test/*.test.ts",
-    "test:ci": "c8 --reporter=text --reporter=json --check-coverage --branches 90 --functions 90 --lines 90 --statements 90 esm-ts-tap --no-color --no-coverage test/*.test.ts",
-    "ci": "npm run lint && npm run test:ci",
+    "test": "c8 -c test/config/c8-local.json tap --rcfile=test/config/tap.yml test/*.test.ts",
+    "test:ci": "c8 -c test/config/c8-ci.json tap --rcfile=test/config/tap.yml --no-color test/*.test.ts",
+    "ci": "npm run build && npm run test:ci",
     "prepublishOnly": "npm run ci",
     "postpublish": "git push origin && git push origin -f --tags"
   },
   "dependencies": {
-    "ajv": "^8.6.2",
-    "fastify-plugin": "^3.0.0",
-    "http-errors-enhanced": "^1.0.3"
+    "ajv": "^8.10.0",
+    "fastify-plugin": "^3.0.1",
+    "http-errors-enhanced": "^1.0.4"
   },
   "devDependencies": {
-    "@cowtech/eslint-config": "^8.0.1",
-    "@cowtech/esm-package-utils": "^0.9.3",
-    "@types/node": "^17.0.2",
-    "@types/tap": "^15.0.5",
-    "ajv-formats": "^2.1.0",
-    "c8": "^7.8.0",
-    "fastify": "^3.20.2",
-    "prettier": "^2.3.2",
-    "tap": "^15.0.9",
-    "ts-node": "^10.2.0",
-    "typescript": "^4.2.4"
+    "@cowtech/eslint-config": "^8.4.0",
+    "@swc/cli": "^0.1.55",
+    "@swc/core": "^1.2.150",
+    "@types/node": "^17.0.21",
+    "@types/tap": "^15.0.6",
+    "ajv-formats": "^2.1.1",
+    "c8": "^7.11.0",
+    "chokidar": "^3.5.3",
+    "fastify": "^3.27.2",
+    "prettier": "^2.5.1",
+    "tap": "^15.2.3",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.2"
   },
   "engines": {
     "node": ">=14.15.0"

src/handlers.ts

@@ -10,9 +10,9 @@ import {
   serializeError,
   UnsupportedMediaTypeError
 } from 'http-errors-enhanced'
-import { GenericObject, kHttpErrorsEnhancedConfiguration, NodeError, RequestSection } from './interfaces'
-import { upperFirst } from './utils'
-import { convertValidationErrors, validationMessagesFormatters, ValidationResult } from './validation'
+import { GenericObject, kHttpErrorsEnhancedConfiguration, NodeError, RequestSection } from './interfaces.js'
+import { upperFirst } from './utils.js'
+import { convertValidationErrors, validationMessagesFormatters, ValidationResult } from './validation.js'
 
 export function handleNotFoundError(request: FastifyRequest, reply: FastifyReply): void {
   handleErrors(new NotFoundError('Not found.'), request, reply)

src/index.ts

@@ -1,12 +1,16 @@
 import { FastifyError, FastifyInstance, FastifyPluginOptions } from 'fastify'
 import fastifyPlugin from 'fastify-plugin'
-import { handleErrors, handleNotFoundError } from './handlers'
-import { Configuration, kHttpErrorsEnhancedConfiguration, kHttpErrorsEnhancedResponseValidations } from './interfaces'
-import { addResponseValidation, compileResponseValidationSchema } from './validation'
-
-export * from './handlers'
-export * from './interfaces'
-export { convertValidationErrors, niceJoin, validationMessagesFormatters } from './validation'
+import { handleErrors, handleNotFoundError } from './handlers.js'
+import {
+  Configuration,
+  kHttpErrorsEnhancedConfiguration,
+  kHttpErrorsEnhancedResponseValidations
+} from './interfaces.js'
+import { addResponseValidation, compileResponseValidationSchema } from './validation.js'
+
+export * from './handlers.js'
+export * from './interfaces.js'
+export { convertValidationErrors, niceJoin, validationMessagesFormatters } from './validation.js'
 
 export const plugin = fastifyPlugin(
   function (instance: FastifyInstance, options: FastifyPluginOptions, done: (error?: FastifyError) => void): void {

src/utils.ts

@@ -3,7 +3,7 @@ export function upperFirst(source: any): string {
     return source
   }
 
-  return source[0].toUpperCase() + source.substring(1)
+  return source[0].toUpperCase() + source.slice(1)
 }
 
 export function get<T>(target: any, path: string): T {
@@ -16,12 +16,8 @@ export function get<T>(target: any, path: string): T {
       break
     }
 
-    const index = token.match(/^(\d+)|(?:\[(\d+)\])$/)
-    if (index) {
-      target = target[parseInt(index[1] ?? index[2], 10)]
-    } else {
-      target = target[token]
-    }
+    const index = token.match(/^(\d+)|\[(\d+)]$/)
+    target = index ? target[Number.parseInt(index[1] ?? index[2], 10)] : target[token]
   }
 
   return target

src/validation.ts

@@ -15,8 +15,8 @@ import {
   ResponseSchemas,
   ValidationFormatter,
   Validations
-} from './interfaces'
-import { get } from './utils'
+} from './interfaces.js'
+import { get } from './utils.js'
 
 export interface ValidationResult extends FastifyValidationResult {
   dataPath: any
@@ -32,7 +32,7 @@ export function niceJoin(array: Array<string>, lastSeparator: string = ' and ',
     case 2:
       return array.join(lastSeparator)
     default:
-      return array.slice(0, array.length - 1).join(separator) + lastSeparator + array[array.length - 1]
+      return array.slice(0, -1).join(separator) + lastSeparator + array.at(-1)!
   }
 }
 
@@ -87,7 +87,7 @@ export const validationMessagesFormatters: { [key: string]: ValidationFormatter
       values.map((f: string) => `"${f}"`),
       ' or '
     )}`,
-  pattern: pattern => `must match pattern "${pattern.replace(/\(\?:/g, '(')}"`,
+  pattern: pattern => `must match pattern "${pattern.replaceAll('(?:', '(')}"`,
   invalidResponseCode: code => `This endpoint cannot respond with HTTP status ${code}.`,
   invalidResponse: code =>
     `The response returned from the endpoint violates its specification for the HTTP status ${code}.`,
@@ -116,13 +116,13 @@ export function convertValidationErrors(
     let key = e.dataPath ?? e.instancePath /* c8 ignore next */ ?? ''
 
     if (key.startsWith('.')) {
-      key = key.substring(1)
+      key = key.slice(1)
     }
 
     // Remove useless quotes
     /* c8 ignore next 3 */
     if (key.startsWith('[') && key.endsWith(']')) {
-      key = key.substring(1, key.length - 1)
+      key = key.slice(1, -1)
     }
 
     // Depending on the type
@@ -165,11 +165,10 @@ export function convertValidationErrors(
         pattern = e.params.pattern as string
         value = get<string>(data, key)
 
-        if (pattern === '.+' && !value) {
-          message = validationMessagesFormatters.presentString()
-        } else {
-          message = validationMessagesFormatters.pattern(e.params.pattern)
-        }
+        message =
+          pattern === '.+' && !value
+            ? validationMessagesFormatters.presentString()
+            : validationMessagesFormatters.pattern(e.params.pattern)
 
         break
       case 'format':
@@ -192,8 +191,8 @@ export function convertValidationErrors(
 
     // Remove useless quotes
     /* c8 ignore next 3 */
-    if (key.match(/(?:^['"])(?:[^.]+)(?:['"]$)/)) {
-      key = key.substring(1, key.length - 1)
+    if (/^["'][^.]+["']$/.test(key)) {
+      key = key.slice(1, -1)
     }
 
     // Fix empty properties

test/index.test.ts

@@ -11,7 +11,7 @@ import {
   UNSUPPORTED_MEDIA_TYPE
 } from 'http-errors-enhanced'
 import t from 'tap'
-import { handleErrors, plugin as fastifyHttpErrorsEnhanced } from '../src'
+import { handleErrors, plugin as fastifyHttpErrorsEnhanced } from '../src/index.js'
 
 type Callback = () => void
 
@@ -314,7 +314,7 @@ t.test('Plugin', t => {
         t.equal(response.headers['x-custom-header'], 'Custom-Value')
 
         const payload = JSON.parse(response.payload)
-        t.match(payload.stack[0], /^(?:Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\))$/)
+        t.match(payload.stack[0], /^Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\)$/)
         delete payload.stack
 
         t.same(payload, {
@@ -401,7 +401,7 @@ t.test('Plugin', t => {
       t.equal(response.headers['x-custom-header'], 'Custom-Value')
 
       const payload = JSON.parse(response.payload)
-      t.match(payload.stack[0], /^(?:Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\))$/)
+      t.match(payload.stack[0], /^Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\)$/)
       delete payload.stack
 
       t.same(payload, {
@@ -529,7 +529,7 @@ t.test('Plugin', t => {
       t.equal(response.statusCode, INTERNAL_SERVER_ERROR)
 
       const payload = JSON.parse(response.payload)
-      t.match(payload.stack[0], /^(?:Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\))$/)
+      t.match(payload.stack[0], /^Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\)$/)
       delete payload.stack
 
       t.same(payload, {
@@ -547,7 +547,7 @@ t.test('Plugin', t => {
       t.equal(response.statusCode, INTERNAL_SERVER_ERROR)
 
       const payload = JSON.parse(response.payload)
-      t.match(payload.stack[0], /^(?:Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\))$/)
+      t.match(payload.stack[0], /^Object\.handler \((?:file:\/\/)?\$ROOT\/test\/index\.test\.ts:\d+:\d+\)$/)
       delete payload.stack
 
       t.same(payload, {

test/utils.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-floating-promises */
 
 import t from 'tap'
-import { get, upperFirst } from '../src/utils'
+import { get, upperFirst } from '../src/utils.js'
 
 t.test('Utils', t => {
   t.test('.upperFirst should correctly convert strings', t => {

test/validation.test.ts

@@ -5,8 +5,8 @@ import addFormats from 'ajv-formats'
 import fastify, { FastifyInstance, FastifyPluginOptions, FastifyReply, FastifyRequest } from 'fastify'
 import { ACCEPTED, INTERNAL_SERVER_ERROR, OK } from 'http-errors-enhanced'
 import t from 'tap'
-import { convertValidationErrors, niceJoin, plugin as fastifyErrorProperties } from '../src'
-import { ValidationResult } from '../src/validation'
+import { convertValidationErrors, niceJoin, plugin as fastifyErrorProperties } from '../src/index.js'
+import { ValidationResult } from '../src/validation.js'
 
 function buildServer(options: FastifyPluginOptions = {}): FastifyInstance {
   const server = fastify()

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2021",
     "module": "ESNext",
     "moduleResolution": "node",
     "jsx": "preserve",