diff --git a/CHANGELOG.md b/CHANGELOG.md index 237c0e1..36a438a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Conformance corpus harness (#105, Tier 2): the start of conformance-suite checking, expressed through the validation framework (the OpenAPIKit idiom). A `PureXML.Validation.ConformanceCase` is a `Validatable` named expectation (actual vs spec-authoritative expected output), and `Conformance.matchesExpected` is a `Validation` rule that emits one located `ValidationError` per diverging case, so a whole suite reports every failure at once with the case name as its coding path. Seeded with a Canonical XML 1.0 corpus (attribute ordering, empty-element expansion, comment removal, CDATA-to-escaped-text, processing instructions, namespace rendering) an XPath 1.0 core-function corpus, and an XSD datatype/facet corpus (length, range, pattern, enumeration, and primitive lexical-space checks). Growing the corpora against the official W3C/OASIS suites is the ongoing Tier-2 work. +- Conformance corpus harness (#105, Tier 2): the start of conformance-suite checking, expressed through the validation framework (the OpenAPIKit idiom). A `PureXML.Validation.ConformanceCase` is a `Validatable` named expectation (actual vs spec-authoritative expected output), and `Conformance.matchesExpected` is a `Validation` rule that emits one located `ValidationError` per diverging case, so a whole suite reports every failure at once with the case name as its coding path. Seeded with a Canonical XML 1.0 corpus (attribute ordering, empty-element expansion, comment removal, CDATA-to-escaped-text, processing instructions, namespace rendering) an XPath 1.0 core-function corpus, and an XSD datatype/facet corpus (length, range, pattern, enumeration, lexical space), and a RELAX NG pattern corpus (text, optional, repetition, choice, ordered group, attribute, interleave, empty). Growing the corpora against the official W3C/OASIS suites is the ongoing Tier-2 work. - EXSLT extension functions (#105, Tier 3): the `common`, `math`, and `sets` EXSLT modules, dispatched by resolving a function's prefix to its namespace (so any prefix bound to an EXSLT namespace works). `math:min`, `math:max`, `math:highest`, `math:lowest`, `math:abs`, `math:sqrt` (with the EXSLT NaN rule for non-numeric nodes); `set:distinct`, `set:difference`, `set:intersection`, `set:has-same-node`, `set:leading`, `set:trailing` (by node identity and document order); `exsl:object-type`. `math:power` and the other transcendentals are omitted because they need a C math library, which the pure-Swift, Foundation-free target excludes; `exsl:node-set` awaits result-tree-fragment support. - Canonical XML 1.1 (#105, Tier 3): a `Canonical.Options.canonical11` preset and a `mergeInheritedBase` option. When canonicalizing a document subset, the `xml:base` values of the apex's omitted ancestors are merged into the apex by RFC 3986 reference resolution (vs. 1.0's nearest-ancestor rule), the apex's own relative `xml:base` is resolved against that chain, and `xml:id` is no longer inherited; `xml:lang` and `xml:space` still inherit the nearest. A self-contained RFC 3986 resolver (scheme/authority/path parsing, path merging, dot-segment removal) backs the merge. - Single-byte legacy encodings (#97): the byte decoder gains a table-based single-byte path and the full set of single-byte legacy encodings, selected by the XML declaration's `encoding` name for both the whole-buffer and streaming decoders: the complete ISO-8859 family (parts 2 through 16), Windows-1250/1251/1253/1254/1255/1256/1257/1258, and KOI8-R/U. Most are vendored verbatim from the authoritative `unicode.org` mapping files; ISO-8859-5/9/15 are derived exactly; Windows-1254 composes from Windows-1252. Multi-byte CJK encodings (#99) are tracked separately. diff --git a/README.md b/README.md index c19bc77..9432b21 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ flowchart TB PureXML is a working, dependency-free XML library today: parse, emit, validate, query, and stream documents on macOS, Linux, Windows, and WASM. The test suite -currently runs **811 tests in 125 suites** (`swift test`). +currently runs **812 tests in 125 suites** (`swift test`). ### Shipped (libxml2-aligned surface) diff --git a/Tests/ConformanceCorpusTests.swift b/Tests/ConformanceCorpusTests.swift index 22e0e92..bd1656b 100644 --- a/Tests/ConformanceCorpusTests.swift +++ b/Tests/ConformanceCorpusTests.swift @@ -105,6 +105,40 @@ struct ConformanceCorpusTests { } } + private struct RelaxNGSpec { + let name: String + let schema: String + let xml: String + let valid: Bool + } + + /// RELAX NG pattern conformance: an instance is validated against a compact + /// schema, and the verdict is checked against the pattern's semantics. + private func relaxNGCorpus() throws -> [PureXML.Validation.ConformanceCase] { + let specs = [ + RelaxNGSpec(name: "text-ok", schema: "start = element a { text }", xml: "hi", valid: true), + RelaxNGSpec(name: "text-rejects-child", schema: "start = element a { text }", xml: "", valid: false), + RelaxNGSpec(name: "optional-present", schema: "start = element a { element b { text }? }", xml: "x", valid: true), + RelaxNGSpec(name: "optional-absent", schema: "start = element a { element b { text }? }", xml: "", valid: true), + RelaxNGSpec(name: "oneOrMore-fail", schema: "start = element a { element b { text }+ }", xml: "", valid: false), + RelaxNGSpec(name: "choice-ok", schema: "start = element a { element b { text } | element c { text } }", xml: "y", valid: true), + RelaxNGSpec(name: "group-order-fail", schema: "start = element a { element b { text }, element c { text } }", xml: "yx", valid: false), + RelaxNGSpec(name: "attribute-required", schema: "start = element a { attribute id { text } }", xml: "", valid: false), + RelaxNGSpec(name: "attribute-ok", schema: "start = element a { attribute id { text } }", xml: "", valid: true), + RelaxNGSpec(name: "interleave-order-independent", schema: "start = element a { element b { text } & element c { text } }", xml: "yx", valid: true), + RelaxNGSpec(name: "empty-ok", schema: "start = element a { empty }", xml: "", valid: true), + RelaxNGSpec(name: "empty-rejects-text", schema: "start = element a { empty }", xml: "x", valid: false), + ] + return try specs.map { spec in + let conforms = try PureXML.Schema.RelaxNG(compact: spec.schema).validate(spec.xml) + return PureXML.Validation.ConformanceCase( + name: spec.name, + actual: conforms ? "valid" : "invalid", + expected: spec.valid ? "valid" : "invalid", + ) + } + } + @Test("The C14N conformance corpus passes with no located failures") func test_corpusConforms() throws { let failures = try PureXML.Validation.Conformance.failures(in: canonicalCorpus()) @@ -123,6 +157,12 @@ struct ConformanceCorpusTests { #expect(failures.isEmpty, "\(failures.map(\.reason))") } + @Test("The RELAX NG pattern conformance corpus passes with no located failures") + func test_relaxNGCorpusConforms() throws { + let failures = try PureXML.Validation.Conformance.failures(in: relaxNGCorpus()) + #expect(failures.isEmpty, "\(failures.map(\.reason))") + } + @Test("A divergent case is reported as a located conformance failure") func test_divergenceReported() { let bad = PureXML.Validation.ConformanceCase(name: "wrong", actual: "", expected: "")