andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-21 15:26:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix inline warnings

Browse Source
This commit is contained in:
proddy
2026-06-21 00:12:17 +02:00
parent 00201b1202
commit 679b152dd0
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
interface/src/validators/schema.ts
View File

@@ -90,7 +90,8 @@ const runValidator = async (
const runRule = async ( const runRule = async (
rule: RuleItem, rule: RuleItem,
field: string, field: string,
value: unknown value: unknown,
requiredMessage?: string
): Promise<string | undefined> => { ): Promise<string | undefined> => {
// Custom validators own their empty-value handling and run unconditionally. // Custom validators own their empty-value handling and run unconditionally.
if (typeof rule.validator === 'function') { if (typeof rule.validator === 'function') {
@@ -100,7 +101,9 @@ const runRule = async (
const empty = isEmpty(value); const empty = isEmpty(value);
if (rule.required && empty) { if (rule.required && empty) {
return rule.message ?? `${field} is required`; return (
rule.message ?? requiredMessage?.replace('%s', field) ?? `${field} is required`
);
} }
// Non-required built-in rules don't validate empty values. // Non-required built-in rules don't validate empty values.
@@ -135,11 +138,19 @@ const runRule = async (
export default class Schema { export default class Schema {
private readonly rules: Rules; private readonly rules: Rules;
private requiredMessage?: string;
constructor(descriptor: Rules) { constructor(descriptor: Rules) {
this.rules = descriptor; this.rules = descriptor;
} }
// Mirrors async-validator's `messages()`. Only the `required` template (with
// a `%s` placeholder for the field name) is consumed by this minimal schema.
messages(messages: { required?: string }): this {
this.requiredMessage = messages.required;
return this;
}
// Mirrors async-validator's callback form. Always resolves (never rejects); // Mirrors async-validator's callback form. Always resolves (never rejects);
// callers (validators/shared.ts) inspect the `errors` argument. // callers (validators/shared.ts) inspect the `errors` argument.
async validate( async validate(
@@ -157,7 +168,7 @@ export default class Schema {
const value = source[field]; const value = source[field];
for (const rule of ruleList) { for (const rule of ruleList) {
const message = await runRule(rule, field, value); const message = await runRule(rule, field, value, this.requiredMessage);
if (message !== undefined) { if (message !== undefined) {
const error: ValidateError = { message, field, fieldValue: value }; const error: ValidateError = { message, field, fieldValue: value };
(fields[field] ??= []).push(error); (fields[field] ??= []).push(error);