diff --git a/packages/pdf/tests/r3.highlight-oracles.test.ts b/packages/pdf/tests/r3.highlight-oracles.test.ts index a533616b..125c9808 100644 --- a/packages/pdf/tests/r3.highlight-oracles.test.ts +++ b/packages/pdf/tests/r3.highlight-oracles.test.ts @@ -14,7 +14,7 @@ import { mkdirSync, readFileSync, writeFileSync } from 'node:fs' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' -import { DOMParser, type Node as XmlNode } from '@xmldom/xmldom' +import { DOMParser, type Element as XmlElement, type Node as XmlNode } from '@xmldom/xmldom' import { describe, expect, it } from 'vitest' import type { Observation, SheetSnapshot } from '@faunosteo/domain' import { cleanSvgRoot, renderHighlightedView } from '../src/svg/view' @@ -36,12 +36,12 @@ function treeOf(node: XmlNode): TreeNode { if (node.nodeType === 3 || node.nodeType === 4) return { text: node.nodeValue ?? '' } if (node.nodeType === 8) return { comment: node.nodeValue ?? '' } if (node.nodeType === 7) return { pi: node.nodeName } - const el = node as unknown as Element + const el = node as unknown as XmlElement const attrs: Record = {} const names = Array.from({ length: el.attributes.length }, (_, i) => el.attributes[i]!.name) for (const name of names.sort()) attrs[name] = el.getAttribute(name) ?? '' const children = Array.from({ length: node.childNodes.length }, (_, i) => node.childNodes[i]!) - return { ns: el.namespaceURI, name: el.localName, attrs, children: children.map(treeOf) } + return { ns: el.namespaceURI, name: el.localName ?? el.nodeName, attrs, children: children.map(treeOf) } } const parsedTree = (svg: string) => diff --git a/packages/pdf/tests/r3.sanitiser-oracles.test.ts b/packages/pdf/tests/r3.sanitiser-oracles.test.ts index 535123ea..09d5dbd2 100644 --- a/packages/pdf/tests/r3.sanitiser-oracles.test.ts +++ b/packages/pdf/tests/r3.sanitiser-oracles.test.ts @@ -13,7 +13,7 @@ import { mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' -import { DOMParser, type Node as XmlNode } from '@xmldom/xmldom' +import { DOMParser, type Element as XmlElement, type Node as XmlNode } from '@xmldom/xmldom' import { describe, expect, it } from 'vitest' import { parseSvg, serializeSvg } from '../src/svg/parse' import { sanitizeSvgRoot } from '../src/svg/sanitize' @@ -98,12 +98,12 @@ function treeOf(node: XmlNode): TreeNode { if (node.nodeType === 3 || node.nodeType === 4) return { text: node.nodeValue ?? '' } if (node.nodeType === 8) return { comment: node.nodeValue ?? '' } if (node.nodeType === 7) return { pi: node.nodeName } - const el = node as unknown as Element + const el = node as unknown as XmlElement const attrs: Record = {} const names = Array.from({ length: el.attributes.length }, (_, i) => el.attributes[i]!.name) for (const name of names.sort()) attrs[name] = el.getAttribute(name) ?? '' const children = Array.from({ length: node.childNodes.length }, (_, i) => node.childNodes[i]!) - return { ns: el.namespaceURI, name: el.localName, attrs, children: children.map(treeOf) } + return { ns: el.namespaceURI, name: el.localName ?? el.nodeName, attrs, children: children.map(treeOf) } } type Verdict =