bazis 0.100.6 → 0.100.8

package/library/validation/MessageRegistry.ts

@@ -5,7 +5,7 @@
 export type MessageParams = Readonly<Record<string, unknown>>;
 
 /** Built-in default messages (English). */
-const BUILT_IN: Readonly<Record<string, string>> = {
+export const EN_VALIDATION_MESSAGES: Readonly<Record<string, string>> = Object.freeze({
   validationFailed: "Validation failed",
   invalid: 'Field "{property}" is invalid ({code})',
   required: 'Field "{property}" is required',
@@ -39,30 +39,36 @@ const BUILT_IN: Readonly<Record<string, string>> = {
   customError: 'Check of field "{property}" failed with an error: {error}',
   asyncCustomInSyncCall:
     'Field "{property}": an async custom check is not supported by synchronous validate(); use validateAsync()',
-};
+  unknownField: 'Field "{property}" is forbidden or not declared by the model.',
+});
+const BUILT_IN = EN_VALIDATION_MESSAGES;
 
 /**
- * Russian texts for every built-in code. Apply once at startup:
+ * Russian texts for every built-in code. An application gets them with
+ * `runApp(AppModule, { language: "ru" })`; outside an application:
  * `MessageRegistry.setDefaults(RU_VALIDATION_MESSAGES)`.
+ *
+ * Numbers stand after a dash ("минимальная длина — 5"), so no template needs
+ * a plural form. `typeName.*` keys translate the type names in `type`.
  */
 export const RU_VALIDATION_MESSAGES: Readonly<Record<string, string>> = Object.freeze({
   validationFailed: "Проверка данных не пройдена",
   invalid: 'Поле "{property}" не прошло проверку ({code})',
   required: 'Поле "{property}" обязательно для заполнения',
   notEmpty: 'Поле "{property}" не должно быть пустым',
-  minLength: 'Поле "{property}" должно содержать не менее {min} символов',
-  maxLength: 'Поле "{property}" должно содержать не более {max} символов',
-  length: 'Поле "{property}" должно содержать от {min} до {max} символов',
-  minItems: 'Поле "{property}" должно содержать не менее {min} элементов',
-  maxItems: 'Поле "{property}" должно содержать не более {max} элементов',
-  itemCount: 'Поле "{property}" должно содержать от {min} до {max} элементов',
+  minLength: 'Поле "{property}": минимальная длина — {min}',
+  maxLength: 'Поле "{property}": максимальная длина — {max}',
+  length: 'Поле "{property}": длина — от {min} до {max}',
+  minItems: 'Поле "{property}": минимум элементов — {min}',
+  maxItems: 'Поле "{property}": максимум элементов — {max}',
+  itemCount: 'Поле "{property}": количество элементов — от {min} до {max}',
   contains: 'Поле "{property}" должно содержать "{contains}"',
   notContains: 'Поле "{property}" не должно содержать "{contains}"',
   pattern: 'Поле "{property}" не соответствует формату {pattern}',
   email: 'Поле "{property}" должно быть корректным email-адресом',
   url: 'Поле "{property}" должно быть корректным URL',
   uuid: 'Поле "{property}" должно быть корректным UUID',
-  type: 'Поле "{property}" должно иметь тип {expected}, получено: {actual}',
+  type: 'Поле "{property}": ожидается {expected}, получено: {actual}',
   min: 'Поле "{property}" должно быть не меньше {min}',
   max: 'Поле "{property}" должно быть не больше {max}',
   range: 'Поле "{property}" должно быть в диапазоне от {min} до {max}',
@@ -79,6 +85,15 @@ export const RU_VALIDATION_MESSAGES: Readonly<Record<string, string>> = Object.f
   customError: 'Проверка поля "{property}" завершилась ошибкой: {error}',
   asyncCustomInSyncCall:
     'Поле "{property}": асинхронная custom-проверка не поддерживается синхронным validate(), используйте validateAsync()',
+  unknownField: 'Поле "{property}" запрещено или не объявлено в модели',
+  "typeName.string": "строка",
+  "typeName.number": "число",
+  "typeName.int": "целое число",
+  "typeName.boolean": "логическое значение",
+  "typeName.bool": "логическое значение",
+  "typeName.array": "массив",
+  "typeName.object": "объект",
+  "typeName.JSON object or array": "объект или массив",
 });
 
 /**
@@ -92,6 +107,8 @@ export const RU_VALIDATION_MESSAGES: Readonly<Record<string, string>> = Object.f
 export class MessageRegistry {
   /** Current global templates: a copy of the built-in ones + overrides. */
   private static defaults: Record<string, string> = { ...BUILT_IN };
+  /** Only the templates set through {@link setDefaults}. */
+  private static overrides: Record<string, string> = {};
 
   /**
    * Overrides global messages for error codes.
@@ -107,6 +124,7 @@ export class MessageRegistry {
       const template = messages[code];
       if (typeof template === "string") {
         MessageRegistry.defaults[code] = template;
+        MessageRegistry.overrides[code] = template;
       }
     }
   }
@@ -114,6 +132,12 @@ export class MessageRegistry {
   /** Resets all global overrides to the built-in messages. */
   static reset(): void {
     MessageRegistry.defaults = { ...BUILT_IN };
+    MessageRegistry.overrides = {};
+  }
+
+  /** A template set through {@link setDefaults}, or `undefined`. */
+  static override(code: string): string | undefined {
+    return Object.prototype.hasOwnProperty.call(MessageRegistry.overrides, code) ? MessageRegistry.overrides[code] : undefined;
   }
 
   /**
@@ -137,6 +161,11 @@ export class MessageRegistry {
       if (!Object.prototype.hasOwnProperty.call(params, key) || params[key] === undefined) {
         return placeholder;
       }
+      const value = params[key];
+      if ((key === "expected" || key === "actual") && typeof value === "string") {
+        const typeName = MessageRegistry.defaults[`typeName.${value}`];
+        if (typeName !== undefined && Object.prototype.hasOwnProperty.call(MessageRegistry.defaults, `typeName.${value}`)) return typeName;
+      }
       return MessageRegistry.stringify(params[key]);
     });
   }

package/library/validation/README.md

@@ -47,7 +47,7 @@ More scenarios (complex conditions, async, nested objects) are in
 | `ValidationResult.ts` | the outcome: `isValid`, `errors`, `getErrorsFor`, `hasErrorsFor` |
 | `RuleEngine.ts` | the engine: one pass over the plan, sync/async, nested, cycle protection |
 | `RuleCompiler.ts` | compiles class rules into a plan + WeakMap cache (RegExp, enum Set) |
-| `MessageRegistry.ts` | message templates, placeholders, priority local > global > built-in; built-in texts are English, `RU_VALIDATION_MESSAGES` is a Russian set for `setDefaults` |
+| `MessageRegistry.ts` | message templates, placeholders, priority local > global > built-in; built-in texts are English, `RU_VALIDATION_MESSAGES` is a Russian set for `setDefaults` and `runApp({ language: "ru" })` |
 | `metadata.ts` | stores rules through `context.metadata` / `Symbol.metadata` |
 | `types/ValidatorOptions.ts` | all decorator options |
 | `types/ValidationCode.ts` | error codes |

package/library/validation/RuleEngine.ts

@@ -381,7 +381,7 @@ export class RuleEngine {
         params[key] = extra[key];
       }
     }
-    errors.push(new ValidationError(path, value, MessageRegistry.format(code, o.message, params), code));
+    errors.push(new ValidationError(path, value, MessageRegistry.format(code, o.message, params), code, o.message === undefined ? params : undefined));
   }
 
   private static failType(errors: ValidationError[], path: string, value: unknown, o: ValidatorOptions, expected: string): void {

package/library/validation/SPEC.md

@@ -444,7 +444,13 @@ so a valid object pays no allocations for it.
 
 Template priority: **the decorator's local `message` > global (`setDefaultMessages`) >
 built-in**. A string returned from `custom` wins over all of them.
-Built-in messages are English; `RU_VALIDATION_MESSAGES` is a Russian set for `setDefaultMessages`.
+Built-in messages are English (`EN_VALIDATION_MESSAGES`); `RU_VALIDATION_MESSAGES` is a Russian set for `setDefaultMessages`.
+An HTTP application picks the language with `runApp({ language: "ru", messages })`: each
+`ValidationError` built from a template carries `params`, and the HTTP error handler
+re-renders it in the application language (a rule's own `message` has no `params` and
+stays as is). Priority there: `messages` > `setDefaultMessages` > the language set > English.
+Russian templates put numbers after a dash ("минимальная длина — 5"), so no plural forms are
+needed; `typeName.*` keys translate the type names in the `type` message.
 
 ```ts
 // Globally (once at application start):

package/library/validation/ValidationError.ts

@@ -22,12 +22,16 @@ export class ValidationError {
    * @param value Actual field value at check time.
    * @param message Human-readable message (placeholders already substituted).
    * @param code Machine-readable rule code, for example `"required"` or `"minLength"`.
+   * @param params Placeholder values when `message` comes from the template of
+   *   `code`: an application re-renders it in its language. The engine leaves
+   *   it out for a rule's own `message`.
    */
   constructor(
     readonly property: string,
     readonly value: unknown,
     readonly message: string,
     readonly code?: string,
+    readonly params?: Readonly<Record<string, unknown>>,
   ) {}
 
   /** Short `property: message` form, handy for logs. */

package/library/validation/index.ts

@@ -11,6 +11,6 @@ export { Validator } from "./Validator";
 export { modelValidatorAdapter } from "./modelValidatorAdapter";
 export { ValidationError } from "./ValidationError";
 export { ValidationResult } from "./ValidationResult";
-export { MessageRegistry, RU_VALIDATION_MESSAGES, type MessageParams } from "./MessageRegistry";
+export { EN_VALIDATION_MESSAGES, MessageRegistry, RU_VALIDATION_MESSAGES, type MessageParams } from "./MessageRegistry";
 export { ValidationCodes, type ValidationCode } from "./types/ValidationCode";
 export type { CustomOutcome, CustomValidator, ValidationTypeHint, ValidatorOptions } from "./types/ValidatorOptions";

package/library/validation/modelValidatorAdapter.ts

@@ -7,6 +7,7 @@ interface AdapterValidationIssue {
   readonly property: string;
   readonly message: string;
   readonly code?: string;
+  readonly params?: Readonly<Record<string, unknown>>;
 }
 
 /**
@@ -38,14 +39,11 @@ export const modelValidatorAdapter = {
     return toAdapterResult(instance, await Validator.validateAsync(instance));
   },
 
-  /** A JSON value of the wrong type, in the current `MessageRegistry` language. */
-  typeMismatchMessage(property: string, expected: string, actual: string): string {
-    return MessageRegistry.format("type", undefined, { property, expected, actual });
+  /** A binder message in the current `MessageRegistry` language. */
+  message(code: string, params: Readonly<Record<string, unknown>>): string {
+    return MessageRegistry.format(code, undefined, params);
   },
 
-  failureTitle(): string {
-    return MessageRegistry.format("validationFailed", undefined, {});
-  },
 };
 
 interface AdapterValidationResult {
@@ -59,6 +57,7 @@ function toAdapterResult(instance: object, result: ValidationResult): AdapterVal
       property: error.property,
       message: error.message,
       code: error.code,
+      ...(error.params === undefined ? {} : { params: error.params }),
     }));
     errors.push(...nestedInstanceErrors);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bazis",
-  "version": "0.100.6",
+  "version": "0.100.8",
   "description": "Modular backend framework for Bun in TypeScript: DI wired by codegen, HTTP, a PostgreSQL ORM, JWT, WebSocket, agents and a CLI.",
   "license": "MIT",
   "author": "Alexander Alenin",