exisjs 0.9.0 → 0.9.2

package/dist/validator/engine.js

@@ -1,36 +1,223 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TexDiscriminatedUnionEngine = exports.TexTransformedEngine = exports.TexEngine = void 0;
+exports.fieldRule = fieldRule;
 const compile_1 = require("./compile");
 const tex_types_1 = require("./tex-types");
 const error_1 = require("./error");
+const rules_1 = require("./rules");
+function safely(run) {
+    try {
+        return { success: true, data: run() };
+    }
+    catch (err) {
+        if (err instanceof error_1.ValidatorError) {
+            return { success: false, errors: err.errors, error: err };
+        }
+        throw err;
+    }
+}
+async function safelyAsync(run) {
+    try {
+        return { success: true, data: await run() };
+    }
+    catch (err) {
+        if (err instanceof error_1.ValidatorError) {
+            return { success: false, errors: err.errors, error: err };
+        }
+        throw err;
+    }
+}
+function engineModifiers(engine) {
+    return ((engine._isOptional ? ' | optional' : '') +
+        (engine._isNullable ? ' | nullable' : ''));
+}
+/**
+ * The rule string for one field of an object schema. Shared by `tex.object`,
+ * `tex.array`, `tex.record`, `tex.union` and `extend` so a nested schema
+ * keeps its `optional()` / `nullable()` modifiers on every path.
+ */
+function fieldRule(key, value) {
+    if (value instanceof TexEngine) {
+        return `object<${JSON.stringify(value.getCompiledSchema())}>${engineModifiers(value)}`;
+    }
+    if (value instanceof TexTransformedEngine) {
+        return fieldRule(key, value.inner);
+    }
+    if (value instanceof TexDiscriminatedUnionEngine)
+        return 'object';
+    if (value instanceof tex_types_1.TexType)
+        return value._raw;
+    if (typeof value === 'string')
+        return value;
+    if (value === undefined || value === null) {
+        throw new TypeError(`tex.object(): field "${key}" has no schema (got ${value})`);
+    }
+    throw new TypeError(`tex.object(): field "${key}" is not a field schema (got ${value?.constructor?.name ?? typeof value}); use tex.object(), tex.array() or a tex.* field`);
+}
+// Error code and expected value for a constraint text ("must be a string")
+function describeConstraint(constraint) {
+    if (constraint.startsWith('must be a string')) {
+        return { code: 'INVALID_TYPE', expected: 'string' };
+    }
+    if (constraint.startsWith('must be a number')) {
+        return { code: 'INVALID_TYPE', expected: 'number' };
+    }
+    if (constraint.startsWith('must be a boolean')) {
+        return { code: 'INVALID_TYPE', expected: 'boolean' };
+    }
+    if (constraint.startsWith('must be an array')) {
+        return { code: 'INVALID_TYPE', expected: 'array' };
+    }
+    if (constraint.includes('array must have')) {
+        return { code: 'ARRAY_TOO_SHORT', expected: 'array' };
+    }
+    if (constraint.includes('array exceeds')) {
+        return { code: 'ARRAY_TOO_LONG', expected: 'array' };
+    }
+    if (constraint.startsWith('must be an object')) {
+        return { code: 'INVALID_TYPE', expected: 'object' };
+    }
+    if (constraint.startsWith('must be a valid email')) {
+        return { code: 'INVALID_EMAIL', expected: 'valid email address' };
+    }
+    if (constraint.startsWith('must be one of')) {
+        return {
+            code: 'INVALID_ENUM_VALUE',
+            expected: constraint.replace('must be one of', '').trim(),
+        };
+    }
+    if (constraint.startsWith('must be at least') ||
+        constraint.startsWith('must be >=')) {
+        return { code: 'VALUE_TOO_SMALL', expected: constraint };
+    }
+    if (constraint.startsWith('must be at most') ||
+        constraint.startsWith('must be <=')) {
+        return { code: 'VALUE_TOO_LARGE', expected: constraint };
+    }
+    if (constraint.startsWith('must contain a number')) {
+        return {
+            code: 'PASSWORD_REQUIRES_NUMBER',
+            expected: 'must contain at least one digit',
+        };
+    }
+    if (constraint.startsWith('must contain an uppercase')) {
+        return {
+            code: 'PASSWORD_REQUIRES_UPPERCASE',
+            expected: 'must contain at least one uppercase letter',
+        };
+    }
+    if (constraint.startsWith('must contain a lowercase')) {
+        return {
+            code: 'PASSWORD_REQUIRES_LOWERCASE',
+            expected: 'must contain at least one lowercase letter',
+        };
+    }
+    if (constraint.startsWith('must contain a symbol')) {
+        return {
+            code: 'PASSWORD_REQUIRES_SYMBOL',
+            expected: 'must contain at least one symbol',
+        };
+    }
+    return { code: 'VALIDATION_ERROR', expected: constraint };
+}
+/** Turns a failed rule into a structured error entry */
+function describeRuleError(err, data) {
+    let path = (0, rules_1.formatPath)(err.path);
+    let message;
+    let expected;
+    let code;
+    switch (err.kind) {
+        case 'missing':
+            message = 'Expected value, received undefined';
+            expected = 'defined';
+            code = 'MISSING_REQUIRED_FIELD';
+            break;
+        case 'strict':
+            path = path ? `${path}.${err.detail}` : err.detail;
+            message = 'Unknown field not allowed in strict mode';
+            expected = 'undefined (field omitted)';
+            code = 'UNRECOGNIZED_KEYS';
+            break;
+        case 'input':
+            message = err.detail;
+            code = 'VALIDATION_ERROR';
+            break;
+        case 'custom':
+            message = err.detail;
+            expected = err.expected;
+            code = err.code ?? 'CUSTOM_VALIDATION';
+            break;
+        default: {
+            message = err.detail.charAt(0).toUpperCase() + err.detail.slice(1);
+            if (err.code) {
+                code = err.code;
+                expected = err.expected ?? err.detail;
+            }
+            else {
+                ;
+                ({ code, expected } = describeConstraint(err.detail));
+            }
+        }
+    }
+    if (path === '')
+        path = 'root';
+    const received = (0, error_1.formatReceivedValue)((0, error_1.getNestedValue)(data, path));
+    return { path, message, expected, received, code };
+}
+const MAX_ERRORS = 100;
+/** Runs object-level `refine()` rules on a validated object */
+function objectRulesCheck(rules) {
+    return (v) => {
+        for (const r of rules) {
+            if (!r.fn(v)) {
+                const message = typeof r.message === 'function'
+                    ? r.message(v)
+                    : r.message || 'Invalid value';
+                const err = new rules_1.RuleError('custom', message, 'CUSTOM_VALIDATION', 'custom refinement rule');
+                if (r.path)
+                    err.path.push(...r.path.split('.'));
+                throw err;
+            }
+        }
+        return v;
+    };
+}
 class TexEngine {
     constructor(schema, rawSchema, strict = false, isOptional = false) {
         this._isOptional = false;
+        this._isNullable = false;
+        // Object-level refine() rules, run once every field is valid
+        this._objectRules = [];
         this.schema = schema;
         this.rawSchema = rawSchema;
         this.strict = strict;
         this._isOptional = isOptional;
-        this.validator = (0, compile_1.compileSchema)(schema, strict);
+        this.validator = (0, compile_1.compileSchema)(schema, strict, rawSchema);
     }
     /**
      * The compiled validator stops at the first problem, which keeps valid
-     * requests fast. Once a parse has failed, every other top-level field is
-     * checked on its own so the response lists all failing fields (capped).
+     * requests fast. Once a parse has failed, every field is checked on its
+     * own, descending into nested objects, array items and record values, so
+     * the response lists every failing value (capped).
      */
-    collectErrors(first, data) {
-        const errors = [this.describeError(first, data)];
+    collectErrors(first, data, query) {
+        const firstErrors = first instanceof error_1.ValidatorError
+            ? [...first.errors]
+            : [describeRuleError(first, data)];
         if (data === null || typeof data !== 'object' || Array.isArray(data)) {
-            return errors;
+            return firstErrors;
         }
-        const MAX_ERRORS = 100;
-        const failed = new Set(errors.map((e) => e.path.split('.')[0]));
+        const errors = this._collectFields(data, query);
+        // Empty when only an object-level refine() failed
+        return errors.length > 0 ? errors : firstErrors;
+    }
+    /** @internal Checks each field on its own; used after a failed parse */
+    _collectFields(data, query = false) {
+        const errors = [];
         if (this.strict) {
             for (const key of Object.keys(data)) {
-                if (errors.length >= MAX_ERRORS)
-                    return errors;
-                if (!(key in this.schema) && !failed.has(key)) {
-                    failed.add(key);
+                if (!(key in this.schema)) {
                     errors.push({
                         path: key,
                         message: 'Unknown field not allowed in strict mode',
@@ -45,170 +232,107 @@ class TexEngine {
         for (const key of Object.keys(this.schema)) {
             if (errors.length >= MAX_ERRORS)
                 break;
-            if (failed.has(key))
-                continue;
-            let validate = this._fieldValidators.get(key);
+            const cacheKey = query ? `?${key}` : key;
+            let validate = this._fieldValidators.get(cacheKey);
             if (!validate) {
-                validate = (0, compile_1.compileSchema)({ [key]: this.schema[key] }, false);
-                this._fieldValidators.set(key, validate);
-            }
-            try {
-                validate(data);
-            }
-            catch (err) {
-                errors.push(this.describeError(err, data));
-            }
-        }
-        return errors;
-    }
-    /** Turns a validator exception into a structured error entry */
-    describeError(err, data) {
-        let path = 'root';
-        let message = err.message || 'Validation failed';
-        let expected;
-        let code = 'VALIDATION_ERROR';
-        if (message.startsWith('Missing required field: ')) {
-            path = message.replace('Missing required field: ', '').trim();
-            message = 'Expected value, received undefined';
-            expected = 'defined';
-            code = 'MISSING_REQUIRED_FIELD';
-        }
-        else if (message.startsWith("Field '")) {
-            const match = message.match(/Field '([^']+)' (.+)/);
-            if (match) {
-                path = match[1];
-                const constraint = match[2];
-                message = constraint.charAt(0).toUpperCase() + constraint.slice(1);
-                if (constraint.startsWith('must be a string')) {
-                    expected = 'string';
-                    code = 'INVALID_TYPE';
-                }
-                else if (constraint.startsWith('must be a number')) {
-                    expected = 'number';
-                    code = 'INVALID_TYPE';
-                }
-                else if (constraint.startsWith('must be a boolean')) {
-                    expected = 'boolean';
-                    code = 'INVALID_TYPE';
-                }
-                else if (constraint.startsWith('must be an array') ||
-                    constraint.includes('array must have') ||
-                    constraint.includes('array exceeds')) {
-                    expected = 'array';
-                    code = constraint.includes('array must have')
-                        ? 'ARRAY_TOO_SHORT'
-                        : constraint.includes('array exceeds')
-                            ? 'ARRAY_TOO_LONG'
-                            : 'INVALID_TYPE';
-                }
-                else if (constraint.startsWith('must be an object')) {
-                    expected = 'object';
-                    code = 'INVALID_TYPE';
-                }
-                else if (constraint.startsWith('must be a valid email')) {
-                    expected = 'valid email address';
-                    code = 'INVALID_EMAIL';
-                }
-                else if (constraint.startsWith('must be one of')) {
-                    expected = constraint.replace('must be one of', '').trim();
-                    code = 'INVALID_ENUM_VALUE';
-                }
-                else if (constraint.startsWith('must be at least') ||
-                    constraint.startsWith('must be >=')) {
-                    expected = constraint;
-                    code = 'VALUE_TOO_SMALL';
-                }
-                else if (constraint.startsWith('must be at most') ||
-                    constraint.startsWith('must be <=')) {
-                    expected = constraint;
-                    code = 'VALUE_TOO_LARGE';
-                }
-                else if (constraint.startsWith('must contain a number')) {
-                    expected = 'must contain at least one digit';
-                    code = 'PASSWORD_REQUIRES_NUMBER';
-                }
-                else if (constraint.startsWith('must contain an uppercase')) {
-                    expected = 'must contain at least one uppercase letter';
-                    code = 'PASSWORD_REQUIRES_UPPERCASE';
-                }
-                else if (constraint.startsWith('must contain a lowercase')) {
-                    expected = 'must contain at least one lowercase letter';
-                    code = 'PASSWORD_REQUIRES_LOWERCASE';
-                }
-                else if (constraint.startsWith('must contain a symbol')) {
-                    expected = 'must contain at least one symbol';
-                    code = 'PASSWORD_REQUIRES_SYMBOL';
-                }
-                else {
-                    expected = constraint;
-                }
-            }
-        }
-        else if (message.startsWith("Strict mode error: Unknown field '")) {
-            const match = message.match(/Strict mode error: Unknown field '([^']+)'(?: at path '([^']*)')?/);
-            if (match) {
-                const key = match[1];
-                const parentPath = match[2];
-                path =
-                    parentPath && parentPath.length > 0 ? `${parentPath}.${key}` : key;
-                message = 'Unknown field not allowed in strict mode';
-                expected = 'undefined (field omitted)';
-                code = 'UNRECOGNIZED_KEYS';
+                validate = (0, compile_1.compileSchema)({ [key]: this.schema[key] }, false, { [key]: this.rawSchema[key] }, query);
+                this._fieldValidators.set(cacheKey, validate);
             }
+            const found = errorsOf(validate, data);
+            if (found.length === 0)
+                continue;
+            // The failure is inside a nested object or array: list every part
+            const inner = found.some((e) => e.path !== key)
+                ? collectInner(this.rawSchema[key], data[key], key)
+                : [];
+            errors.push(...(inner.length > 0 ? inner : found));
         }
-        const receivedRaw = (0, error_1.getNestedValue)(data, path);
-        const received = (0, error_1.formatReceivedValue)(receivedRaw);
-        return { path, message, expected, received, code };
+        return errors.length > MAX_ERRORS ? errors.slice(0, MAX_ERRORS) : errors;
     }
     getCompiledSchema() {
         return this.schema;
     }
+    /** A copy with another shape that keeps strictness and modifiers */
+    derive(schema, rawSchema) {
+        const engine = new TexEngine(schema, rawSchema, this.strict, this._isOptional);
+        engine._isNullable = this._isNullable;
+        return engine;
+    }
+    /** A copy with the same shape, keeping refine() rules */
+    copy() {
+        const engine = this.derive(this.schema, this.rawSchema);
+        engine._objectRules = this._objectRules;
+        engine._objectCheck = this._objectCheck;
+        return engine;
+    }
+    /** The field may be left out. */
     optional() {
-        return new TexEngine(this.schema, this.rawSchema, this.strict, true);
+        const engine = this.copy();
+        engine._isOptional = true;
+        return engine;
+    }
+    /** The field may be `null`. */
+    nullable() {
+        const engine = this.copy();
+        engine._isNullable = true;
+        return engine;
+    }
+    /**
+     * A check across fields, run once every field is valid. `path` names the
+     * field the error is reported on (default: the object itself).
+     *
+     * @example
+     * ```ts
+     * tex.object({ password: tex.string(), confirm: tex.string() })
+     *   .refine((d) => d.password === d.confirm, { message: 'Passwords must match', path: 'confirm' })
+     * ```
+     */
+    refine(fn, message) {
+        const opts = message !== null && typeof message === 'object' ? message : { message };
+        const engine = this.copy();
+        engine._objectRules = [
+            ...this._objectRules,
+            { fn, message: opts.message, path: opts.path },
+        ];
+        engine._objectCheck = objectRulesCheck(engine._objectRules);
+        return engine;
+    }
+    /** The field may be left out or be `null`. */
+    nullish() {
+        return this.optional().nullable();
     }
     partial() {
         const newSchema = {};
         const newRaw = {};
         for (const [key, val] of Object.entries(this.schema)) {
-            newSchema[key] = val.includes('?') ? val : `${val}?`;
+            // Not `val.includes('?')`: a nested rule contains its children's `?`
+            newSchema[key] = `${val} | optional`;
             const rawVal = this.rawSchema[key];
-            if (rawVal instanceof tex_types_1.TexType) {
-                newRaw[key] = new tex_types_1.TexType(newSchema[key]);
-                newRaw[key].sanitizers = rawVal.sanitizers;
-                newRaw[key].refinements = rawVal.refinements;
-            }
-            else if (rawVal instanceof TexEngine) {
+            if (rawVal instanceof tex_types_1.TexType || rawVal instanceof TexEngine) {
                 newRaw[key] = rawVal.optional();
             }
+            else if (rawVal !== null && typeof rawVal === 'object') {
+                newRaw[key] = rawVal;
+            }
             else {
                 newRaw[key] = newSchema[key];
             }
         }
-        return new TexEngine(newSchema, newRaw, this.strict, this._isOptional);
+        return this.derive(newSchema, newRaw);
     }
     extend(extension) {
         const newSchema = { ...this.schema };
         const newRaw = { ...this.rawSchema };
         for (const [key, val] of Object.entries(extension)) {
-            if (val instanceof TexEngine) {
-                newSchema[key] = `object<${JSON.stringify(val.getCompiledSchema())}>`;
-                newRaw[key] = val;
-            }
-            else if (val instanceof tex_types_1.TexType) {
-                newSchema[key] = val._raw;
-                newRaw[key] = val;
-            }
-            else {
-                newSchema[key] = val;
-                newRaw[key] = val;
-            }
+            newSchema[key] = fieldRule(key, val);
+            newRaw[key] = val;
         }
-        return new TexEngine(newSchema, newRaw, this.strict, this._isOptional);
+        return this.derive(newSchema, newRaw);
     }
     merge(other) {
         const newSchema = { ...this.schema, ...other.getCompiledSchema() };
         const newRaw = { ...this.rawSchema, ...other.rawSchema };
-        return new TexEngine(newSchema, newRaw, this.strict, this._isOptional);
+        return this.derive(newSchema, newRaw);
     }
     transform(fn) {
         return new TexTransformedEngine(this, fn);
@@ -222,7 +346,7 @@ class TexEngine {
                 newRaw[key] = this.rawSchema[key];
             }
         }
-        return new TexEngine(newSchema, newRaw, this.strict, this._isOptional);
+        return this.derive(newSchema, newRaw);
     }
     omit(keys) {
         const newSchema = {};
@@ -233,24 +357,26 @@ class TexEngine {
                 newRaw[key] = this.rawSchema[key];
             }
         }
-        return new TexEngine(newSchema, newRaw, this.strict, this._isOptional);
+        return this.derive(newSchema, newRaw);
     }
+    /**
+     * Validates `data` and returns a new object with the declared fields only.
+     * The input is never modified. Throws `ValidatorError` listing every
+     * failing field.
+     */
     parse(data) {
-        const plan = this._plan || (this._plan = splitPlan(buildPlan(this.rawSchema)));
-        const coerceScalars = Boolean(this._isQueryOrParam);
-        // 1. Defaults, empty-string handling, coercion and sanitizers. Only
-        // fields that need any of it are visited.
-        if (data && typeof data === 'object') {
-            const prep = coerceScalars ? plan.prepQuery : plan.prep;
-            for (const f of prep)
-                prepareField(data, f, coerceScalars);
-        }
-        // 2. Type validation (compiled once per schema)
-        let parsedData;
+        const query = Boolean(this._isQueryOrParam);
+        const validate = query
+            ? (this._queryValidator ?? (this._queryValidator = (0, compile_1.compileSchema)(this.schema, this.strict, this.rawSchema, true)))
+            : this.validator;
         try {
-            parsedData = this.validator(data);
+            const result = validate(data);
+            return this._objectCheck ? this._objectCheck(result) : result;
         }
         catch (err) {
+            if (!(err instanceof rules_1.RuleError) && !(err instanceof error_1.ValidatorError)) {
+                throw err;
+            }
             if (data === process.env &&
                 (process.env.__EXIS_SKIP_ENV_CHECK === 'true' ||
                     process.env.EXIS_SKIP_ENV_CHECK === 'true')) {
@@ -270,77 +396,24 @@ class TexEngine {
                 }
                 return mock;
             }
-            throw new error_1.ValidatorError(this.collectErrors(err, data));
-        }
-        if (parsedData && typeof parsedData === 'object' && plan.post.length > 0) {
-            const errors = [];
-            for (const f of plan.post) {
-                const key = f.key;
-                // Preserve Date objects and ensure defaults are applied
-                if (parsedData[key] === undefined &&
-                    f.tex?.defaultValue !== undefined) {
-                    parsedData[key] = resolveDefault(f.tex.defaultValue);
-                }
-                if (f.isDate && data && data[key] instanceof Date) {
-                    parsedData[key] = data[key];
-                }
-                // 3. Post-validation synchronous refinements
-                if (f.hasRefinements && parsedData[key] !== undefined) {
-                    if (!(parsedData[key] === null && f.isNullable)) {
-                        runSyncRefinements(f, parsedData[key], errors);
-                    }
-                }
-            }
-            if (errors.length > 0)
-                throw new error_1.ValidatorError(errors);
-            // 4. Post-validation field transformations
-            for (const f of plan.post) {
-                if (f.tex && f.tex.transformations.length > 0) {
-                    const key = f.key;
-                    if (parsedData[key] !== undefined) {
-                        for (const t of f.tex.transformations) {
-                            parsedData[key] = t(parsedData[key]);
-                        }
-                    }
-                }
-            }
+            throw new error_1.ValidatorError(this.collectErrors(err, data, query));
         }
-        return parsedData;
     }
+    /** Like `parse()`, but returns `{ success, data }` or `{ success, errors }`. */
+    safeParse(data) {
+        return safely(() => this.parse(data));
+    }
+    /** Runs `parse()`, then every `refineAsync()` rule, nested ones included. */
     async parseAsync(data) {
-        const parsed = this.parse(data); // Handles sync sanitizers + rust + sync refine + transformations
-        const errors = [];
-        if (parsed && typeof parsed === 'object') {
-            await Promise.all(Object.entries(this.rawSchema).map(async ([key, val]) => {
-                const valData = parsed[key];
-                const isNullableField = val instanceof tex_types_1.TexType &&
-                    (val._raw.includes('nullable') || val._raw.includes('nullish'));
-                if (valData === null && isNullableField)
-                    return;
-                if (valData !== undefined &&
-                    val instanceof tex_types_1.TexType &&
-                    val.refinements.length > 0) {
-                    for (const r of val.refinements) {
-                        if (r.async && !(await r.fn(valData))) {
-                            const msg = typeof r.message === 'function'
-                                ? r.message(valData)
-                                : r.message || 'Invalid value';
-                            errors.push({
-                                path: key,
-                                message: msg,
-                                expected: 'custom async refinement rule',
-                                received: (0, error_1.formatReceivedValue)(valData),
-                                code: 'CUSTOM_VALIDATION',
-                            });
-                        }
-                    }
-                }
-            }));
-        }
+        const parsed = this.parse(data);
+        const errors = await runAsyncRefinements(this, parsed);
         if (errors.length > 0)
             throw new error_1.ValidatorError(errors);
         return parsed;
     }
+    safeParseAsync(data) {
+        return safelyAsync(() => this.parseAsync(data));
+    }
     toMongoSchema() {
         const schemaDef = {};
         for (const [key, rawDef] of Object.entries(this.schema)) {
@@ -350,6 +423,7 @@ class TexEngine {
             const field = {};
             if (baseType.startsWith('string') ||
                 baseType.startsWith('email') ||
+                baseType.startsWith('url') ||
                 baseType.startsWith('uuid') ||
                 baseType.startsWith('cuid') ||
                 baseType.startsWith('password')) {
@@ -379,15 +453,17 @@ class TexEngine {
         for (const [key, rawVal] of Object.entries(this.rawSchema)) {
             const rawDef = this.schema[key] || '';
             const typeStr = rawDef.split('|')[0].trim();
-            const isOptional = typeStr.endsWith('?') ||
-                rawDef.includes('optional') ||
-                rawVal?._isOptional;
+            // A nested rule's text includes its children's modifiers
+            const engine = rawVal instanceof TexTransformedEngine ? rawVal.inner : rawVal;
+            const isOptional = engine instanceof TexEngine
+                ? engine._isOptional || / \| optional$/.test(rawDef)
+                : typeStr.endsWith('?') || rawDef.includes('optional');
             let prop;
             if (rawVal && typeof rawVal.toOpenApi === 'function') {
                 prop = rawVal.toOpenApi();
             }
             else {
-                const baseType = typeStr.replace('?', '');
+                const baseType = (0, rules_1.ruleBase)(rawDef);
                 prop = {};
                 if (baseType.startsWith('string') ||
                     baseType.startsWith('uuid') ||
@@ -399,6 +475,10 @@ class TexEngine {
                     prop.type = 'string';
                     prop.format = 'email';
                 }
+                else if (baseType.startsWith('url')) {
+                    prop.type = 'string';
+                    prop.format = 'uri';
+                }
                 else if (baseType.startsWith('number')) {
                     prop.type = 'number';
                 }
@@ -414,7 +494,7 @@ class TexEngine {
                 }
                 else if (baseType.startsWith('enum:')) {
                     prop.type = 'string';
-                    prop.enum = baseType.replace('enum:', '').split(',');
+                    prop.enum = (0, rules_1.parseEnumValues)(baseType.slice(5));
                 }
                 else {
                     prop.type = 'object';
@@ -427,6 +507,8 @@ class TexEngine {
         const result = { type: 'object', properties };
         if (required.length > 0)
             result.required = required;
+        if (this.strict)
+            result.additionalProperties = false;
         return result;
     }
 }
@@ -440,10 +522,16 @@ class TexTransformedEngine {
         const validated = this.inner.parse(data);
         return this.transformFn(validated);
     }
+    safeParse(data) {
+        return safely(() => this.parse(data));
+    }
     async parseAsync(data) {
         const validated = await this.inner.parseAsync(data);
         return this.transformFn(validated);
     }
+    safeParseAsync(data) {
+        return safelyAsync(() => this.parseAsync(data));
+    }
     toOpenApi() {
         return this.inner.toOpenApi();
     }
@@ -455,14 +543,30 @@ class TexDiscriminatedUnionEngine {
         this.variants = variants;
         this.engines = variants.map((v) => v instanceof TexEngine
             ? v
-            : new TexEngine(Object.fromEntries(Object.entries(v).map(([k, val]) => [
-                k,
-                val instanceof tex_types_1.TexType ? val._raw : String(val),
-            ])), v));
+            : new TexEngine(Object.fromEntries(Object.entries(v).map(([k, val]) => [k, fieldRule(k, val)])), v));
+        this.tags = this.engines.map((engine) => {
+            const rule = engine.getCompiledSchema()[discriminator];
+            if (rule === undefined)
+                return [];
+            const base = (0, rules_1.ruleBase)(rule);
+            if (base.startsWith('literal:'))
+                return [(0, rules_1.parseLiteral)(base.slice(8))];
+            if (base.startsWith('enum:'))
+                return (0, rules_1.parseEnumValues)(base.slice(5));
+            return [];
+        });
     }
-    parse(data) {
+    /** The variant whose discriminator matches `data`, if any */
+    variantFor(data) {
+        if (!data || typeof data !== 'object')
+            return undefined;
+        const tag = data[this.discriminator];
+        const i = this.tags.findIndex((tags) => tags.includes(tag));
+        return i === -1 ? undefined : this.engines[i];
+    }
+    noMatch(data) {
         if (!data || typeof data !== 'object') {
-            throw new error_1.ValidatorError([
+            return new error_1.ValidatorError([
                 {
                     path: '',
                     message: 'Expected an object for discriminated union payload',
@@ -474,7 +578,7 @@ class TexDiscriminatedUnionEngine {
         }
         const tagValue = data[this.discriminator];
         if (tagValue === undefined) {
-            throw new error_1.ValidatorError([
+            return new error_1.ValidatorError([
                 {
                     path: this.discriminator,
                     message: `Missing discriminator field '${this.discriminator}'`,
@@ -484,83 +588,33 @@ class TexDiscriminatedUnionEngine {
                 },
             ]);
         }
-        for (const engine of this.engines) {
-            const rawField = engine.rawSchema?.[this.discriminator];
-            let matches = false;
-            if (rawField instanceof tex_types_1.TexType) {
-                if (rawField._raw.startsWith('literal:')) {
-                    const literalVal = rawField._raw
-                        .replace('literal:', '')
-                        .split('|')[0]
-                        .trim();
-                    if (String(tagValue) === literalVal)
-                        matches = true;
-                }
-                else if (rawField._raw.startsWith('enum:')) {
-                    const allowed = rawField._raw
-                        .replace('enum:', '')
-                        .split('|')[0]
-                        .trim()
-                        .split(',');
-                    if (allowed.includes(String(tagValue)))
-                        matches = true;
-                }
-            }
-            else if (typeof rawField === 'string' &&
-                rawField.startsWith('literal:')) {
-                const literalVal = rawField.replace('literal:', '').split('|')[0].trim();
-                if (String(tagValue) === literalVal)
-                    matches = true;
-            }
-            if (matches) {
-                return engine.parse(data);
-            }
-        }
-        throw new error_1.ValidatorError([
+        return new error_1.ValidatorError([
             {
                 path: this.discriminator,
                 message: `Invalid discriminator value '${tagValue}' for field '${this.discriminator}'`,
-                expected: 'one of matching variant discriminators',
+                expected: `one of ${JSON.stringify(this.tags.flat())}`,
                 received: (0, error_1.formatReceivedValue)(tagValue),
                 code: 'INVALID_DISCRIMINATOR_VALUE',
             },
         ]);
     }
+    parse(data) {
+        const engine = this.variantFor(data);
+        if (!engine)
+            throw this.noMatch(data);
+        return engine.parse(data);
+    }
+    safeParse(data) {
+        return safely(() => this.parse(data));
+    }
     async parseAsync(data) {
-        if (!data || typeof data !== 'object') {
-            return this.parse(data);
-        }
-        const tagValue = data[this.discriminator];
-        if (tagValue === undefined) {
-            return this.parse(data);
-        }
-        for (const engine of this.engines) {
-            const rawField = engine.rawSchema?.[this.discriminator];
-            let matches = false;
-            if (rawField instanceof tex_types_1.TexType) {
-                if (rawField._raw.startsWith('literal:')) {
-                    const literalVal = rawField._raw
-                        .replace('literal:', '')
-                        .split('|')[0]
-                        .trim();
-                    if (String(tagValue) === literalVal)
-                        matches = true;
-                }
-                else if (rawField._raw.startsWith('enum:')) {
-                    const allowed = rawField._raw
-                        .replace('enum:', '')
-                        .split('|')[0]
-                        .trim()
-                        .split(',');
-                    if (allowed.includes(String(tagValue)))
-                        matches = true;
-                }
-            }
-            if (matches) {
-                return engine.parseAsync(data);
-            }
-        }
-        return this.parse(data);
+        const engine = this.variantFor(data);
+        if (!engine)
+            throw this.noMatch(data);
+        return engine.parseAsync(data);
+    }
+    safeParseAsync(data) {
+        return safelyAsync(() => this.parseAsync(data));
     }
     toOpenApi() {
         const oneOf = this.engines.map((e) => e.toOpenApi());
@@ -573,258 +627,147 @@ class TexDiscriminatedUnionEngine {
     }
 }
 exports.TexDiscriminatedUnionEngine = TexDiscriminatedUnionEngine;
-function needsPrep(f, coerceScalars) {
-    return (f.tex?.defaultValue !== undefined ||
-        f.emptyString !== 'keep' ||
-        f.isDate ||
-        f.stringCoerce ||
-        f.number === 'coerce' ||
-        f.boolean === 'coerce' ||
-        (coerceScalars && (f.number === 'query' || f.boolean === 'query')) ||
-        f.array !== 'no' ||
-        (f.tex !== null && f.tex.sanitizers.length > 0) ||
-        (f.item !== null && f.item.sanitizers.length > 0));
-}
-function splitPlan(plan) {
-    return {
-        prep: plan.filter((f) => needsPrep(f, false)),
-        prepQuery: plan.filter((f) => needsPrep(f, true)),
-        post: plan.filter((f) => f.tex?.defaultValue !== undefined ||
-            f.isDate ||
-            f.hasRefinements ||
-            (f.tex !== null && f.tex.transformations.length > 0)),
-    };
-}
-function scalarMode(plain, raw, type, coerce) {
-    if (!plain || !raw.startsWith(type))
-        return 'no';
-    return coerce ? 'coerce' : 'query';
-}
-function arrayMode(plain, raw, coerce) {
-    if (!plain || !coerce || !raw.startsWith('array<'))
-        return 'no';
-    if (raw.startsWith('array<number'))
-        return 'number';
-    if (raw.startsWith('array<boolean'))
-        return 'boolean';
-    return 'other';
+// ─── Error collection ────────────────────────────────────────────────────────
+function errorsOf(validate, data) {
+    try {
+        validate(data);
+        return [];
+    }
+    catch (err) {
+        if (err instanceof error_1.ValidatorError)
+            return [...err.errors];
+        if (err instanceof rules_1.RuleError)
+            return [describeRuleError(err, data)];
+        throw err;
+    }
 }
-function buildPlan(rawSchema) {
-    const plan = [];
-    for (const key of Object.keys(rawSchema)) {
-        const val = rawSchema[key];
-        const tex = val instanceof tex_types_1.TexType ? val : null;
-        const raw = tex ? tex._raw : String(val);
-        // Unions coerce per alternative inside the compiled rule
-        const plain = tex !== null && !raw.includes('||');
-        const coerce = raw.includes('coerce');
-        const nullable = raw.includes('nullable');
-        const nullish = raw.includes('nullish');
-        const optional = raw.includes('optional');
-        let emptyString = 'keep';
-        if (optional ||
-            nullable ||
-            nullish ||
-            raw.includes('?') ||
-            val?._isOptional) {
-            emptyString = nullable && !optional && !nullish ? 'null' : 'delete';
-        }
-        const item = val?._item instanceof tex_types_1.TexType ? val._item : null;
-        const isDate = plain && raw.startsWith('date');
-        plan.push({
-            key,
-            tex,
-            emptyString,
-            isDate,
-            dateCoerce: isDate && coerce,
-            minDate: isDate ? raw.match(/minDate:([^\s|]+)/)?.[1] : undefined,
-            maxDate: isDate ? raw.match(/maxDate:([^\s|]+)/)?.[1] : undefined,
-            stringCoerce: plain && coerce && raw.startsWith('string'),
-            number: scalarMode(plain, raw, 'number', coerce),
-            boolean: scalarMode(plain, raw, 'boolean', coerce),
-            array: arrayMode(plain, raw, coerce),
-            item,
-            isNullable: tex !== null && (nullable || nullish),
-            hasRefinements: (tex !== null && tex.refinements.length > 0) ||
-                (item !== null && item.refinements.length > 0),
+// Validates one item of an array (or one value of a record) at a time
+const itemValidators = new WeakMap();
+function itemValidator(container, isArray) {
+    let validate = itemValidators.get(container);
+    if (!validate) {
+        const item = isArray ? container._item : container._value;
+        const coerce = isArray && (0, rules_1.ruleParts)(container._raw).includes('coerce');
+        const rule = isArray
+            ? `array<${fieldRule('[item]', item)}>${coerce ? ' | coerce' : ''}`
+            : `record<${fieldRule('[value]', item)}>`;
+        validate = (0, compile_1.compileSchema)({ v: rule }, false, {
+            v: isArray ? { _item: item } : { _value: item },
         });
+        itemValidators.set(container, validate);
     }
-    return plan;
-}
-function resolveDefault(defaultValue) {
-    return typeof defaultValue === 'function' ? defaultValue() : defaultValue;
+    return validate;
 }
-function fieldError(key, value, message, expected, code) {
-    throw new error_1.ValidatorError([
-        {
-            path: key,
-            message,
-            expected,
-            received: (0, error_1.formatReceivedValue)(value),
-            code,
-        },
-    ]);
+function relabel(errors, from, to) {
+    return errors.map((e) => ({
+        ...e,
+        path: e.path.startsWith(from) ? to + e.path.slice(from.length) : to,
+    }));
 }
-function prepareDate(key, value, f) {
-    if (f.dateCoerce &&
-        (typeof value === 'string' || typeof value === 'number')) {
-        const d = new Date(value);
-        if (isNaN(d.getTime())) {
-            fieldError(key, value, 'Must be a valid date', 'valid date string or timestamp', 'INVALID_DATE');
-        }
-        value = d;
-    }
-    if (!(value instanceof Date) &&
-        typeof value !== 'string' &&
-        typeof value !== 'number') {
-        fieldError(key, value, 'Must be a valid date', 'valid date or date string', 'INVALID_TYPE');
-    }
-    if (value instanceof Date && isNaN(value.getTime())) {
-        fieldError(key, value, 'Must be a valid date', 'valid date string or timestamp', 'INVALID_DATE');
-    }
-    const time = new Date(value).getTime();
-    if (f.minDate && time < new Date(f.minDate).getTime()) {
-        fieldError(key, value, `Date must be after ${f.minDate}`, `>= ${f.minDate}`, 'DATE_TOO_EARLY');
-    }
-    if (f.maxDate && time > new Date(f.maxDate).getTime()) {
-        fieldError(key, value, `Date must be before ${f.maxDate}`, `<= ${f.maxDate}`, 'DATE_TOO_LATE');
+/** Every failing value inside a nested object, array or record at `path` */
+function collectInner(raw, value, path) {
+    if (value === null || typeof value !== 'object')
+        return [];
+    const engine = raw instanceof TexEngine
+        ? raw
+        : raw instanceof TexTransformedEngine
+            ? raw.inner
+            : undefined;
+    if (engine) {
+        if (Array.isArray(value))
+            return [];
+        return engine._collectFields(value).map((e) => ({
+            ...e,
+            path: e.path === 'root' ? path : `${path}.${e.path}`,
+        }));
+    }
+    if (!(raw instanceof tex_types_1.TexType))
+        return [];
+    const isArray = Array.isArray(value);
+    const item = isArray ? raw._item : raw._value;
+    if (item === undefined)
+        return [];
+    const validate = itemValidator(raw, isArray);
+    const keys = isArray
+        ? value.map((_, i) => i)
+        : Object.keys(value).filter((k) => k !== '__proto__' && k !== 'constructor');
+    const out = [];
+    for (const k of keys) {
+        if (out.length >= MAX_ERRORS)
+            break;
+        const single = isArray ? [value[k]] : { [k]: value[k] };
+        const at = isArray ? `v[0]` : `v.${k}`;
+        const itemPath = isArray ? `${path}[${k}]` : `${path}.${k}`;
+        const found = errorsOf(validate, { v: single });
+        if (found.length === 0)
+            continue;
+        const nested = found.some((e) => e.path !== at)
+            ? collectInner(item, value[k], itemPath)
+            : [];
+        out.push(...(nested.length > 0 ? nested : relabel(found, at, itemPath)));
     }
-    return value;
+    return out;
 }
-function prepareField(data, f, coerceScalars) {
-    const key = f.key;
-    const tex = f.tex;
-    // Apply default value / lazy factory function if field is omitted
-    if (data[key] === undefined && tex?.defaultValue !== undefined) {
-        data[key] = resolveDefault(tex.defaultValue);
-    }
-    if (f.emptyString !== 'keep' &&
-        typeof data[key] === 'string' &&
-        data[key].trim() === '') {
-        if (f.emptyString === 'null') {
-            data[key] = null;
-        }
-        else {
-            delete data[key];
-            if (tex?.defaultValue !== undefined) {
-                data[key] = resolveDefault(tex.defaultValue);
-            }
-        }
-    }
-    let value = data[key];
+// ─── Async refinements ───────────────────────────────────────────────────────
+// Walks the parsed value next to its schema, so `refineAsync()` rules run at
+// every depth: nested objects, array items and record values.
+function joinPath(path, key) {
+    if (typeof key === 'number')
+        return `${path}[${key}]`;
+    return path ? `${path}.${key}` : key;
+}
+function collectAsync(node, value, path, tasks) {
     if (value === undefined || value === null)
         return;
-    if (f.isDate)
-        data[key] = value = prepareDate(key, value, f);
-    if (f.stringCoerce && typeof value !== 'string') {
-        data[key] = value = String(value);
-    }
-    if ((f.number === 'coerce' || (f.number === 'query' && coerceScalars)) &&
-        typeof value === 'string' &&
-        value.trim() !== '') {
-        const n = Number(value);
-        if (isNaN(n))
-            fieldError(key, value, 'Must be a number', 'number', 'INVALID_TYPE');
-        data[key] = value = n;
-    }
-    if ((f.boolean === 'coerce' || (f.boolean === 'query' && coerceScalars)) &&
-        typeof value === 'string' &&
-        value.trim() !== '') {
-        const lower = value.toLowerCase().trim();
-        if (lower === 'true' || lower === '1')
-            data[key] = value = true;
-        else if (lower === 'false' || lower === '0')
-            data[key] = value = false;
-        else {
-            fieldError(key, value, 'Must be a boolean', 'boolean (true or false)', 'INVALID_TYPE');
+    if (node instanceof TexEngine) {
+        if (typeof value !== 'object')
+            return;
+        const raw = node.rawSchema;
+        for (const key of Object.keys(raw)) {
+            collectAsync(raw[key], value[key], joinPath(path, key), tasks);
         }
+        return;
     }
-    if (f.array !== 'no')
-        data[key] = coerceArray(value, f.array);
-    if (tex !== null && tex.sanitizers.length > 0) {
-        for (const s of tex.sanitizers) {
-            if (data[key] === undefined || data[key] === null)
-                break;
-            data[key] = s(data[key]);
-        }
+    if (node instanceof TexDiscriminatedUnionEngine) {
+        const engine = node.variantFor(value);
+        if (engine)
+            collectAsync(engine, value, path, tasks);
+        return;
     }
-    const item = f.item;
-    if (item !== null && item.sanitizers.length > 0 && Array.isArray(data[key])) {
-        const arr = data[key];
-        for (let i = 0; i < arr.length; i++) {
-            for (const s of item.sanitizers) {
-                if (arr[i] === undefined || arr[i] === null)
-                    break;
-                arr[i] = s(arr[i]);
-            }
-        }
+    if (!(node instanceof tex_types_1.TexType))
+        return;
+    for (const r of node.refinements) {
+        if (!r.async)
+            continue;
+        tasks.push(Promise.resolve(r.fn(value)).then((ok) => ok
+            ? null
+            : {
+                path: path || 'root',
+                message: (0, rules_1.refinementMessage)(r, value),
+                expected: 'custom async refinement rule',
+                received: (0, error_1.formatReceivedValue)(value),
+                code: 'CUSTOM_VALIDATION',
+            }));
     }
-}
-function coerceItem(item, kind) {
-    if (typeof item !== 'string')
-        return item;
-    if (kind === 'number') {
-        const n = Number(item);
-        return isNaN(n) ? item : n;
-    }
-    if (kind === 'boolean') {
-        const lower = item.toLowerCase();
-        if (lower === 'true')
-            return true;
-        if (lower === 'false')
-            return false;
-    }
-    return item;
-}
-function coerceArray(value, kind) {
-    if (!Array.isArray(value)) {
-        if (typeof value !== 'string')
-            return [value];
-        const parts = value.includes(',')
-            ? value.split(',').map((s) => s.trim())
-            : [value];
-        return kind === 'other' ? parts : parts.map((p) => coerceItem(p, kind));
-    }
-    return kind === 'other' ? value : value.map((v) => coerceItem(v, kind));
-}
-function refinementMessage(r, value) {
-    return typeof r.message === 'function'
-        ? r.message(value)
-        : r.message || 'Invalid value';
-}
-function runSyncRefinements(f, value, errors) {
-    if (f.tex !== null) {
-        for (const r of f.tex.refinements) {
-            if (!r.async && !r.fn(value)) {
-                errors.push({
-                    path: f.key,
-                    message: refinementMessage(r, value),
-                    expected: 'custom refinement rule',
-                    received: (0, error_1.formatReceivedValue)(value),
-                    code: 'CUSTOM_VALIDATION',
-                });
-            }
+    const item = node._item;
+    if (item && Array.isArray(value)) {
+        for (let i = 0; i < value.length; i++) {
+            collectAsync(item, value[i], joinPath(path, i), tasks);
         }
     }
-    const item = f.item;
-    if (item === null || item.refinements.length === 0 || !Array.isArray(value)) {
-        return;
-    }
-    const itemNullable = item._raw.includes('nullable') || item._raw.includes('nullish');
-    for (let i = 0; i < value.length; i++) {
-        if (value[i] === null && itemNullable)
-            continue;
-        for (const r of item.refinements) {
-            if (!r.async && !r.fn(value[i])) {
-                errors.push({
-                    path: `${f.key}[${i}]`,
-                    message: refinementMessage(r, value[i]),
-                    expected: 'custom refinement rule',
-                    received: (0, error_1.formatReceivedValue)(value[i]),
-                    code: 'CUSTOM_VALIDATION',
-                });
-            }
+    const recordValue = node._value;
+    if (recordValue && typeof value === 'object') {
+        for (const key of Object.keys(value)) {
+            collectAsync(recordValue, value[key], joinPath(path, key), tasks);
         }
     }
 }
+async function runAsyncRefinements(engine, parsed) {
+    const tasks = [];
+    collectAsync(engine, parsed, '', tasks);
+    if (tasks.length === 0)
+        return [];
+    const results = await Promise.all(tasks);
+    return results.filter((e) => e !== null);
+}
 //# sourceMappingURL=engine.js.map