Skip to content

Update /dom/use to prefer href attribute with xlink namespace fallback #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swhitty merged 1 commit into from
Aug 25, 2026
Merged

Update /dom/use to prefer href attribute with xlink namespace fallback #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion DOM/Sources/Parser.XML.Use.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,17 @@
extension XMLParser {

func parseUse(_ att: any AttributeParser) throws -> DOM.Use {
let use = DOM.Use(href: try att.parseUrl("xlink:href"))
let href: DOM.URL = try {
do {
return try att.parseUrl("href")
} catch XMLParser.Error.missingAttribute(_) {
/// Backward compatibility for the deprecated "xlink:href"
/// https://www.w3.org/TR/SVG/linking.html#XLinkRefAttrs
return try att.parseUrl("xlink:href")
}
}()

let use = DOM.Use(href: href)
use.x = try att.parseCoordinate("x")
use.y = try att.parseCoordinate("y")

Expand Down
39 changes: 29 additions & 10 deletions DOM/Tests/UseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,38 @@ struct UseTests {

@Test
func use() throws {
var node = ["xlink:href": "#line2", "href": "#line1"]

var parsed = try XMLParser().parseUse(node)
#expect(parsed.href.fragmentID == "line2")
let parsed = try XMLParser().parseUse(["href": "#line1"])
#expect(parsed.href.fragmentID == "line1")
#expect(parsed.x == nil)
#expect(parsed.y == nil)

node["x"] = "20"
node["y"] = "30"
let legacyParsed = try XMLParser().parseUse([
"xlink:href": "#line2",
"x": "20",
"y": "30"
])
#expect(legacyParsed.href.fragmentID == "line2")
#expect(legacyParsed.x == 20)
#expect(legacyParsed.y == 30)
}

@Test
func usePrefersHrefWhenBothAttributesArePresent() throws {
let parsed = try XMLParser().parseUse([
"href": "#modern",
"xlink:href": "#legacy"
])

parsed = try XMLParser().parseUse(node)
#expect(parsed.href.fragmentID == "line2")
#expect(parsed.x == 20)
#expect(parsed.y == 30)
#expect(parsed.href.fragmentID == "modern")
}

@Test
func useDoesNotFallbackToXLinkHrefWhenHrefIsInvalid() {
#expect(throws: XMLParser.Error.self) {
_ = try XMLParser().parseUse([
"href": "https://[invalid",
"xlink:href": "#legacy"
])
}
}
}
Loading