@tsed/config 8.16.0-rc.1 → 8.16.0-rc.3

package/lib/esm/hooks/afterResolveConfiguration.js

@@ -1,9 +1,7 @@
-import "@tsed/ajv";
 import { configuration, constant, injectable, logger } from "@tsed/di";
 import { $off, $on, $once } from "@tsed/hooks";
 import { CONFIG_SOURCES } from "../constants/constants.js";
 import { getConfigSources } from "../utils/getConfigSources.js";
-import { validate } from "../utils/validate.js";
 export async function afterResolveConfiguration() {
     const sources = getConfigSources(constant("extends", []));
     for (const source of sources.values()) {
@@ -17,7 +15,8 @@ export async function afterResolveConfiguration() {
         const refresh = async () => {
             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);
             configuration().set(`configs.${name}`, data);

package/lib/esm/utils/validate.js

@@ -1,15 +1,26 @@
-import { AjvService } from "@tsed/ajv";
-import { inject } from "@tsed/di";
-export async function validate(configName, config, validationSchema) {
-    const ajv = inject(AjvService);
-    try {
-        return await ajv.validate(config, {
-            returnsCoercedValues: true,
-            schema: validationSchema.toJSON()
-        });
+import { Ajv } from "ajv";
+const ajv = new Ajv({
+    verbose: false,
+    coerceTypes: true,
+    strict: false,
+    discriminator: true,
+    allErrors: true
+});
+class ValidationError extends Error {
+    constructor(message, errors) {
+        super(message);
+        this.name = "VALIDATION_ERROR";
+        this.errors = errors;
     }
-    catch (er) {
-        er.message = er.message.replace("Value.", `extends[${configName}].`);
-        throw er;
+}
+export function validate(configName, config, validationSchema) {
+    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;
 }