Mihaela Mihaljevic
f15786c0a5
Close the remaining documented parity edges: - Canonical XML 2.0 TrimTextNodes: an option that strips leading and trailing whitespace from each text node (dropping all-whitespace nodes), exposed as Options.canonical2. - XML Catalog delegation and chaining: delegatePublic, delegateSystem, delegateURI, and nextCatalog entries are parsed, and resolveSystem/ resolvePublic/resolveURI gain a loadingCatalog overload that follows the longest matching delegate prefix and then each nextCatalog, with a visited-set guard against cycles. - XPath number formatting: the canonical string form now expands any exponent in the shortest double rendering to a plain decimal, since XPath 1.0 forbids scientific notation. Closes #70
47 lines
2.0 KiB
Swift
47 lines
2.0 KiB
Swift
public extension PureXML.Canonical {
|
|
/// Whether to render every in-scope namespace (inclusive C14N) or only the
|
|
/// namespaces an element and its attributes actually use (exclusive C14N).
|
|
enum Mode: Equatable, Sendable {
|
|
case inclusive
|
|
case exclusive
|
|
}
|
|
|
|
/// Options for canonicalization. The default is inclusive C14N without
|
|
/// comments, matching the common XML-signature use.
|
|
///
|
|
/// For whole-document and whole-subtree canonicalization, C14N 1.0 and 1.1
|
|
/// produce identical output (their differences only affect `xml:*` attribute
|
|
/// inheritance into selected document subsets), so this single inclusive mode
|
|
/// covers both.
|
|
struct Options: Equatable, Sendable {
|
|
public var mode: Mode
|
|
public var includeComments: Bool
|
|
/// Prefixes always rendered in exclusive mode even when not visibly used
|
|
/// (the `InclusiveNamespaces` PrefixList).
|
|
public var inclusiveNamespacePrefixes: [String]
|
|
/// The Canonical XML 2.0 `TrimTextNodes` parameter: when true, leading and
|
|
/// trailing whitespace is stripped from each text node, and a text node
|
|
/// that is all whitespace is dropped.
|
|
public var trimTextNodes: Bool
|
|
|
|
public init(
|
|
mode: Mode = .inclusive,
|
|
includeComments: Bool = false,
|
|
inclusiveNamespacePrefixes: [String] = [],
|
|
trimTextNodes: Bool = false,
|
|
) {
|
|
self.mode = mode
|
|
self.includeComments = includeComments
|
|
self.inclusiveNamespacePrefixes = inclusiveNamespacePrefixes
|
|
self.trimTextNodes = trimTextNodes
|
|
}
|
|
|
|
/// Inclusive C14N without comments.
|
|
public static let inclusive = Options(mode: .inclusive)
|
|
/// Exclusive C14N without comments.
|
|
public static let exclusive = Options(mode: .exclusive)
|
|
/// Canonical XML 2.0 with text-node trimming enabled.
|
|
public static let canonical2 = Options(mode: .inclusive, trimTextNodes: true)
|
|
}
|
|
}
|