@tsed/config 8.16.0-rc.2 → 8.16.0-rc.4

package/lib/types/hooks/afterResolveConfiguration.d.ts

@@ -1,2 +1 @@
-import "@tsed/ajv";
 export declare function afterResolveConfiguration(): Promise<void>;

package/lib/types/utils/validate.d.ts

@@ -1,2 +1 @@
-import { JsonSchema } from "@tsed/schema";
-export declare function validate(configName: string, config: Record<string, unknown>, validationSchema: JsonSchema): Promise<any>;
+export declare function validate(configName: string, config: Record<string, unknown>, validationSchema: any): Record<string, unknown>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/config",
   "description": "Configuration management for Ts.ED",
   "type": "module",
-  "version": "8.16.0-rc.2",
+  "version": "8.16.0-rc.4",
   "keywords": [
     "Ts.ED",
     "Configuration",
@@ -57,15 +57,15 @@
     "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
   },
   "dependencies": {
+    "ajv": "^8.17.1",
     "change-case": "5.4.4",
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/ajv": "8.16.0-rc.2",
-    "@tsed/barrels": "8.16.0-rc.2",
-    "@tsed/core": "8.16.0-rc.2",
-    "@tsed/di": "8.16.0-rc.2",
-    "@tsed/typescript": "8.16.0-rc.2",
+    "@tsed/barrels": "8.16.0-rc.4",
+    "@tsed/core": "8.16.0-rc.4",
+    "@tsed/di": "8.16.0-rc.4",
+    "@tsed/typescript": "8.16.0-rc.4",
     "@types/js-yaml": "4.0.9",
     "dotenv": "^16.5.0",
     "dotenv-expand": "^12.0.2",

package/src/hooks/afterResolveConfiguration.ts

@@ -1,6 +1,4 @@
-import "@tsed/ajv";
-
-import {configuration, constant, inject, injectable, logger} from "@tsed/di";
+import {configuration, constant, injectable, logger} from "@tsed/di";
 import {$off, $on, $once} from "@tsed/hooks";
 
 import {CONFIG_SOURCES} from "../constants/constants.js";
@@ -26,7 +24,8 @@ export async function afterResolveConfiguration() {
       let data = await getAll.apply(instance);
 
       if (validationSchema) {
-        data = await validate(name!, data, validationSchema);
+        const {validate} = await import("../utils/validate.js");
+        data = validate(name!, data, validationSchema);
       }
 
       configuration().set(data);

package/src/utils/validate.ts

@@ -1,18 +1,35 @@
-import {AjvService} from "@tsed/ajv";
-import {inject} from "@tsed/di";
-import {JsonSchema} from "@tsed/schema";
-
-export async function validate(configName: string, config: Record<string, unknown>, validationSchema: JsonSchema) {
-  const ajv = inject(AjvService);
-
-  try {
-    return await ajv.validate(config, {
-      returnsCoercedValues: true,
-      schema: validationSchema.toJSON()
-    });
-  } catch (er) {
-    er.message = er.message.replace("Value.", `extends[${configName}].`);
-
-    throw er;
+import {Ajv, type ErrorObject} from "ajv";
+
+const ajv = new Ajv({
+  verbose: false,
+  coerceTypes: true,
+  strict: false,
+  discriminator: true,
+  allErrors: true
+});
+
+class ValidationError extends Error {
+  private errors: ErrorObject[];
+
+  constructor(message: string, errors: ErrorObject[]) {
+    super(message);
+    this.name = "VALIDATION_ERROR";
+    this.errors = errors;
+  }
+}
+
+export function validate(configName: string, config: Record<string, unknown>, validationSchema: any) {
+  const schema = "toJSON" in validationSchema ? validationSchema.toJSON() : validationSchema;
+
+  const validate = ajv.compile(schema);
+  const result = validate(config);
+
+  if (!result && validate.errors) {
+    const firstError = validate.errors[0];
+    const message = `extends[${configName}].${firstError?.instancePath?.substring(1) || ""} ${firstError?.message}.`;
+
+    throw new ValidationError(message, validate.errors);
   }
+
+  return config;
 }