Mihaela M
fc1a6db1dc
The tagged-node validator carried its own copy of the validation machinery: a Tagged.Rule cloning Validation's check type and a Tagged.Context cloning its context, differing only in subject type. That is the per-layer duplication the validation idiom exists to prevent (principle 10). Generalise the type-directed framework over both the subject and the document: SubjectContext, Check, and AnyCheck now take a Document type parameter for the validated tree's root. The model layer validates with a Model.Value document, the tagged layer with a Tagged.Node document, each truthful rather than forcing one root type to stand in for the other. The tagged layer keeps only what is genuinely its own: the Node document type, its built-in check (now Tagged.BuiltinCheck, a Check<Node, Node>), and its traversal. Tagged.Rule and the tagged Context are removed. The validator surface is unchanged but validating now takes a Check<Node, Node>. All 399 tests pass; the coverage gate reconciles to 62 public types.
50 lines
2.3 KiB
Swift
50 lines
2.3 KiB
Swift
public extension PureYAML.Validation {
|
|
/// A type-directed validation value (the `Validation<Subject>` of the validation idiom): a
|
|
/// positive `description`, a `predicate` that gates application, and a multi-error `check`. It is
|
|
/// applied only to values of type `Subject`, anywhere they occur in the traversed tree. `Document`
|
|
/// is the type of the validated tree's root, the same for every check a given validator runs.
|
|
struct Check<Subject: Validatable, Document: Sendable>: Sendable {
|
|
public let description: String
|
|
public let predicate: @Sendable (SubjectContext<Subject, Document>) -> Bool
|
|
public let check: @Sendable (SubjectContext<Subject, Document>) -> [Issue]
|
|
|
|
/// Multi-error form: return one issue per problem. Use when a subject can fail several ways.
|
|
public init(
|
|
description: String,
|
|
check: @escaping @Sendable (SubjectContext<Subject, Document>) -> [Issue],
|
|
when predicate: @escaping @Sendable (SubjectContext<Subject, Document>) -> Bool = { _ in true },
|
|
) {
|
|
self.description = description
|
|
self.predicate = predicate
|
|
self.check = check
|
|
}
|
|
|
|
/// Single-error Bool form: a positive description plus a check whose `false` auto-produces the
|
|
/// one issue `"Failed to satisfy: <description>"`. The dominant form.
|
|
public init(
|
|
description: String,
|
|
severity: Severity = .error,
|
|
check: @escaping @Sendable (SubjectContext<Subject, Document>) -> Bool,
|
|
when predicate: @escaping @Sendable (SubjectContext<Subject, Document>) -> Bool = { _ in true },
|
|
) {
|
|
self.init(
|
|
description: description,
|
|
check: { context in
|
|
check(context)
|
|
? []
|
|
: [Issue(severity: severity, reason: "Failed to satisfy: \(description)", path: context.path)]
|
|
},
|
|
when: predicate,
|
|
)
|
|
}
|
|
|
|
/// Gates on the predicate, then runs the check.
|
|
public func apply(_ context: SubjectContext<Subject, Document>) -> [Issue] {
|
|
guard predicate(context) else {
|
|
return []
|
|
}
|
|
return check(context)
|
|
}
|
|
}
|
|
}
|