An identity-constraint (unique/key/keyref) field that selects an absent attribute or an empty element whose declaration carries a default or fixed value now takes that value as its identity-tuple component, so two members can collide on the defaulted value (idG011/idG012 default, idF016/idF017 fixed) where the duplicate was previously missed. The default/fixed value constraints on identity-field targets are gathered at compile time (identityFieldConstraints, mirroring identityFieldTypes) and threaded through to the identity validator. The substitution is exact about absent versus present-empty: an @attr field is defaulted only when the attribute is ABSENT (an empty node-set), never when present with value ""; a "." element field only when the selected element has no character content. Applying a default only adds an identity value where the schema declares one, so it can create a genuine duplicate-key detection but never reject a valid instance. To keep within the file/type-size and one-type-per-file limits, FieldValue, XPathQueryCache, and the schema-location hints were extracted to their own files (behavior-preserving moves). invalid-instances-accepted 50 to 45, no false positive (valid-instances-rejected and valid-schemas-rejected held at 0), no other bucket moved. An adversarial review probed present-empty attributes, element content winning over a default, fixed values, keyref matching, multi-field keys, and merged-schema defaults, and found no over-rejection.
123 lines
6.6 KiB
Swift
123 lines
6.6 KiB
Swift
public extension PureXML.Validation {
|
|
/// The compiled-schema context the XSD validations read: the named-type table
|
|
/// a content model resolves against, the identity constraints, and the root
|
|
/// element's declared type.
|
|
struct XSDContext {
|
|
public let types: [String: PureXML.Schema.ElementType]
|
|
public let constraints: [String: [PureXML.Schema.IdentityConstraint]]
|
|
public let rootDeclaration: PureXML.Schema.ElementType?
|
|
public let nillableElements: Set<String>
|
|
public let elementConstraints: [String: PureXML.Schema.ValueConstraint]
|
|
public let abstractTypes: Set<String>
|
|
public let typeBlock: [String: Set<PureXML.Schema.DerivationMethod>]
|
|
public let elementBlock: [String: Set<PureXML.Schema.DerivationMethod>]
|
|
public let typeDerivation: [String: PureXML.Schema.TypeDerivation]
|
|
public let globalAttributes: [String: PureXML.Schema.AttributeUse]
|
|
public let identityFieldTypes: [String: PureXML.Schema.SimpleType]
|
|
public let identityFieldConstraints: [String: PureXML.Schema.ValueConstraint]
|
|
|
|
public init(
|
|
types: [String: PureXML.Schema.ElementType],
|
|
constraints: [String: [PureXML.Schema.IdentityConstraint]],
|
|
rootDeclaration: PureXML.Schema.ElementType?,
|
|
nillableElements: Set<String> = [],
|
|
elementConstraints: [String: PureXML.Schema.ValueConstraint] = [:],
|
|
abstractTypes: Set<String> = [],
|
|
typeBlock: [String: Set<PureXML.Schema.DerivationMethod>] = [:],
|
|
elementBlock: [String: Set<PureXML.Schema.DerivationMethod>] = [:],
|
|
typeDerivation: [String: PureXML.Schema.TypeDerivation] = [:],
|
|
globalAttributes: [String: PureXML.Schema.AttributeUse] = [:],
|
|
identityFieldTypes: [String: PureXML.Schema.SimpleType] = [:],
|
|
identityFieldConstraints: [String: PureXML.Schema.ValueConstraint] = [:],
|
|
) {
|
|
self.types = types
|
|
self.constraints = constraints
|
|
self.rootDeclaration = rootDeclaration
|
|
self.nillableElements = nillableElements
|
|
self.elementConstraints = elementConstraints
|
|
self.abstractTypes = abstractTypes
|
|
self.typeBlock = typeBlock
|
|
self.elementBlock = elementBlock
|
|
self.typeDerivation = typeDerivation
|
|
self.globalAttributes = globalAttributes
|
|
self.identityFieldTypes = identityFieldTypes
|
|
self.identityFieldConstraints = identityFieldConstraints
|
|
}
|
|
}
|
|
}
|
|
|
|
public extension PureXML.Validation {
|
|
/// ``XSDContext``, in the OpenAPIKit idiom: each rule is a named, removable
|
|
/// ``Validation`` value with a positive description, and the ``validator()``
|
|
/// composes them; failures are located ``ValidationError``s.
|
|
///
|
|
/// Scope note (the #101 decision). XSD content validation is *one* recursive
|
|
/// ``Validation`` (``contentValidity``) rather than a separate rule per
|
|
/// constraint, because XSD is a recursive type system: a child's type is
|
|
/// resolved from its parent's content model and position, then rewritten by
|
|
/// `xsi:type` and the derivation controls mid-walk. The constraint categories
|
|
/// (attributes, content model, derivation, nillability, fixed values) are
|
|
/// interdependent through that resolution, so they cannot be split into
|
|
/// independent rules without either changing semantics or duplicating the
|
|
/// recursion. This is the sanctioned multi-error form (the rule's `check`
|
|
/// returns one located error per violation). Each category is isolation-tested
|
|
/// through crafted inputs so it is verifiable on its own, which is the
|
|
/// testability the idiom asks for. Identity constraints, which *are*
|
|
/// independent, are a separate rule (``identityConstraints``).
|
|
enum XSD {
|
|
/// The document element is valid against its declared XSD type.
|
|
static var contentValidity: Validation<PureXML.Model.Node, XSDContext> {
|
|
.init(
|
|
description: "The document element is valid against its XSD type",
|
|
check: { context in
|
|
guard case let .element(root) = context.subject, let declaration = context.document.rootDeclaration else {
|
|
return []
|
|
}
|
|
let schema = context.document
|
|
let validator = PureXML.Schema.ComplexValidator(
|
|
types: schema.types,
|
|
globalAttributes: schema.globalAttributes,
|
|
nillableElements: schema.nillableElements,
|
|
elementConstraints: schema.elementConstraints,
|
|
abstractTypes: schema.abstractTypes,
|
|
typeBlock: schema.typeBlock,
|
|
elementBlock: schema.elementBlock,
|
|
typeDerivation: schema.typeDerivation,
|
|
)
|
|
var errors = validator.validate(root, as: declaration, at: [.element(root.name.description)])
|
|
// Document-scoped ID uniqueness and IDREF resolution, gathered
|
|
// during the typed walk above, reported once the tree is seen.
|
|
errors += validator.idErrors()
|
|
return errors
|
|
},
|
|
when: { $0.codingPath.isEmpty },
|
|
)
|
|
}
|
|
|
|
/// The document's XSD identity constraints (`unique`, `key`, `keyref`) hold.
|
|
static var identityConstraints: Validation<PureXML.Model.Node, XSDContext> {
|
|
.init(
|
|
description: "XSD identity constraints hold",
|
|
check: { context -> [PureXML.Validation.ValidationError] in
|
|
guard case let .element(root) = context.subject else { return [] }
|
|
return PureXML.Schema.IdentityValidator(
|
|
constraints: context.document.constraints,
|
|
fieldTypes: context.document.identityFieldTypes,
|
|
fieldConstraints: context.document.identityFieldConstraints,
|
|
types: context.document.types,
|
|
).validate(PureXML.Model.TreeNode(context.subject), at: [.element(root.name.description)])
|
|
},
|
|
when: { $0.codingPath.isEmpty },
|
|
)
|
|
}
|
|
|
|
/// A validator combining the content-model and identity-constraint rules.
|
|
static func validator() -> Validator<XSDContext> {
|
|
Validator<XSDContext>.defaults(
|
|
nonReference: [AnyValidation(contentValidity)],
|
|
reference: [AnyValidation(identityConstraints)],
|
|
)
|
|
}
|
|
}
|
|
}
|