[feature] W3C XSLT/XQuery Serialization 3.1 compliance: XML/HTML/XHTML/JSON/text/adaptive#6346
Open
joewiz wants to merge 29 commits into
Open
[feature] W3C XSLT/XQuery Serialization 3.1 compliance: XML/HTML/XHTML/JSON/text/adaptive#6346joewiz wants to merge 29 commits into
joewiz wants to merge 29 commits into
Conversation
4 tasks
reinhapa
requested changes
May 11, 2026
| } | ||
|
|
||
| switch (localName) { | ||
| case "map": |
Member
|
The unit tests do not finish. The root cause is not clear, yet. I see a 401 unauthorized thrown by an attempt to load the XQTS runner but also a NPE when trying to read thread info followed by a closed JVM fork. |
joewiz
added a commit
to joewiz/exist
that referenced
this pull request
May 11, 2026
Per reinhapa's review on PR eXist-db#6346 (Codacy): - The localName-dispatch switch in writeJsonElement is now an arrow switch with per-case helpers (writeJsonMap, writeJsonArray, writeJsonString, writeJsonNumber, writeJsonBoolean, writeJsonNull); the default still raises FOJS0006. - The reader.getLocalName() switch inside the legacy nodeValueToJsonViaStream() START_ELEMENT branch is now arrow-form. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Member
Author
|
[This response was co-authored with Claude Code. -Joe] Converted both flagged switches to arrow syntax. New tip:
RE the hung-tests unit-test job (XQTS-runner 401 → fork NPE): matches the known infra shape we've been tracking — re-run should clear on a different runner slot. |
reinhapa
approved these changes
May 11, 2026
Contributor
|
@joewiz can you rebase. We need a fresh Ci run, 5 codacy warnings. 4 look actionable. |
Corrects multiple issues in how serialization parameters are parsed and validated: - Fix type checking to allow subtypes (e.g., xs:string subtype of xs:anyAtomicType) and coerce xs:untypedAtomic to target type - Accept "false", "0" as boolean false (not just "no") - Trim whitespace in XML serialization parameter values - Fix multi-value QName parameter cardinality check (was backwards) - Fix standalone=omit handling, normalize boolean true/false/1/0 to yes/no - Add SEPM0009 validation for contradictory use-character-maps - Add SEPM0016 error for character map key length validation - Add SEPM0017 validation for serialization-parameters XML element form - Add SERE0023 validation for multi-item sequences in JSON serialization - Accept eXist-specific parameters in XML serialization element form (fixes regression from eXist-db#3446) - Fix fn:json-to-xml option validation for liberal/duplicates params - Register QT4 serialization parameters: escape-solidus, json-lines, canonical, CSV field/row/quote params Spec: W3C Serialization 3.1 §5 (XML Output Method), QT4 Serialization 4.0 §3.1.1 (Serialization Parameters) XQTS: Fixes serialize-xml-*, serialize-json-* parameter validation tests Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Comprehensive improvements to the core XML serializer (XMLWriter) and
indentation handling (IndentingXMLWriter):
Character escaping:
- Escape CR (U+000D), DEL (U+007F), and LINE SEPARATOR (U+2028)
- Escape C0 control characters (U+0001-U+001F) in XML 1.1 mode
- Fix character reference escaping in CDATA sections
CDATA sections:
- Encoding-aware CDATA split: break on ]]> and on characters not
representable in the output encoding
- Use cdata-section-elements with namespace-aware element matching
- Add shouldUseCdataSections() hook for subclass override
XML declaration and standalone:
- Normalize standalone="omit" to omit the attribute entirely
- Normalize boolean true/false/1/0 to yes/no for standalone
- Emit XML declaration when standalone is explicitly set
Canonical XML (C14N):
- Buffer namespace and attribute events for sorted emission
- Sort namespaces by prefix (default first), attributes by namespace
URI then local name
- Expand empty elements: <foo/> becomes <foo></foo>
- Validate relative namespace URIs (SERE0024)
Normalization form:
- Support NFC, NFD, NFKC, NFKD normalization forms
- Apply normalization during character output
XML 1.1:
- C0 control character escaping (U+0001-U+001F except tab/newline/CR)
Indentation:
- Support suppress-indentation with URI-qualified element names
- Accept boolean true/1 alongside yes for indent parameter
Spec: W3C Serialization 3.1 §5 (XML Output Method),
Canonical XML 1.1 (https://www.w3.org/TR/xml-c14n11/) §2.3,
XML 1.1 §2.2 (Characters)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Major improvements to XHTMLWriter for correct HTML/XHTML output:
Content-type meta injection:
- Write <meta http-equiv="Content-Type" ...> or <meta charset="...">
as first child of <head> when include-content-type=yes (default)
- HTML5 uses <meta charset="UTF-8"> shorthand
- XHTML uses self-closing <meta .../> for valid XML output
- Track head element state, reset between serializations
HTML method support:
- Boolean attribute minimization (checked, disabled, selected, etc.)
- Raw text elements (script, style) — no escaping in element content
- Suppress cdata-section-elements for HTML method
- Don't escape & before { in HTML attribute values (template syntax)
- Add embed to void/empty elements list
SVG/MathML namespace normalization:
- Collapse SVG and MathML namespace prefixes to default namespace
in XHTML5 serialization (e.g., svg:rect → rect within SVG)
Canonical XML support in XHTML close tag.
HTML version detection: default from 1.0 to 5.0.
Spec: W3C Serialization 3.1 §7 (XHTML Output Method),
W3C Serialization 3.1 §8 (HTML Output Method)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
XHTML5Writer:
- Suppress DOCTYPE for non-<html> root elements (fragment serialization)
- Support doctype-public and doctype-system for XHTML mode
- Suppress DOCTYPE entirely in canonical mode
HTML5Writer:
- Processing instructions use > not ?> for HTML method
- Override needsEscape(char, boolean) for raw text elements
Test: HTML5FragmentTest — 12 new tests for fragment DOCTYPE suppression,
suppress-indentation, CDATA suppression in HTML, script escaping.
Spec: W3C Serialization 3.1 §7.3 (XHTML DOCTYPE),
HTML5 §12.1.3 (Serialization of script/style)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
JSONSerializer:
- SERE0020: Reject INF/NaN in JSON serialization
- SERE0021: Reject function items
- SERE0022: Detect duplicate map keys
- SERE0023: Reject multi-item sequences
- escape-solidus parameter, json-lines parameter
- Canonical JSON (RFC 8785): sorted keys, canonical double format
- Character maps: apply use-character-maps to JSON string output
- Respect indent-spaces for JSON indentation
AdaptiveWriter:
- Fix map output: map{ not map { (spec compliance)
- Fix INF/NaN handling in adaptive double output
FunXmlToJson:
- Rewrite to DOM-based element conversion
- Better handling of element vs document nodes
Spec: W3C Serialization 3.1 §9 (JSON Output Method),
RFC 8785 (JSON Canonicalization Scheme)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
SENR0001 validation:
- Reject maps and function items in XML/text sequence normalization
Text serialization:
- Flatten arrays recursively before text serialization
- Default item-separator to space for text method
XML serialization with item-separator:
- Support XML declaration in item-separator path
CSV serialization dispatch:
- Route method="csv" to CSVSerializer
Canonical XML validation:
- Validate canonical constraints before output
Spec: W3C Serialization 3.1 §2 (Sequence Normalization),
Canonical XML 1.1 §2 (Conformance)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…tors Remove XQST0085 error for namespace undeclaration (xmlns:prefix="") in element constructors. XML 1.1 allows namespace undeclaration. Spec: XML 1.1 §4 (Namespace Undeclaration) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Support loading serialization parameters from an external XML document via declare option output:parameter-document. Parameters from the document are applied first, then inline options override them. Spec: W3C Serialization 3.1 §3.1 (parameter-document) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…ments Two fixes that resolve eXide and other apps failing through the URL rewrite view pipeline: 1. XMLWriter.namespace(): Skip empty default namespace undeclarations (prefix='' nsURI='') that caused "namespace declaration outside an element" error. Also skip the implicit xml namespace prefix. 2. XHTMLWriter.writeContentTypeMeta(): Use self-closing <meta .../> tags in XHTML mode. The URL rewrite pipeline serializes source documents as XHTML (RESTServer forces method=xhtml for text/html), then the view re-parses the serialized output as XML. Non-self-closing <meta> tags made the XHTML output not well-formed XML, causing parseAsXml() to fail and request:get-data() to return a string instead of XML nodes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Tests that HTML documents with <head> elements can be served through the URL rewrite view pipeline without being returned as strings. Background: The W3C Serialization 3.1 spec requires that when include-content-type is "yes" (the default), the XHTML/HTML serializer should include a <meta> content-type declaration as the first child of <head>. Commit e6e395f added writeContentTypeMeta() to XHTMLWriter to implement this requirement. However, the injected <meta> tag used HTML-style non-self-closing format (<meta ...> instead of <meta .../>) even in XHTML mode. When the URL rewrite pipeline serialized a text/html document as XHTML (RESTServer forces method=xhtml for text/html), the non-self-closing <meta> made the output not well-formed XML. The view's request:get-data() then failed to parse it as XML and returned a string, causing XPTY0019. The test stores an HTML document with a <head> element, serves it through a controller.xq + view.xq dispatch, and verifies: - HTTP 200 (not 400 or 500) - Source page content preserved - View wrapper content applied - No raw XML entities in output (indicating string instead of nodes) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…Writer XMLWriter.namespace() was dropping all xmlns="" undeclarations at the top-level guard (prefix="" + URI="" → unconditional early return), so elements with no default namespace inside a default-namespace context were silently missing the required xmlns="" attribute, causing downstream parsers to assign the wrong namespace. Root cause: the single defaultNamespace field approach only checked whether the current value equaled the new value, but never reached that check when both were empty — even when the parent had declared a non-empty default namespace. Fix: adopt a BaseX-style namespace stack (nspaces / nstack). The flat nspaces list records (prefix, uri) pairs for all in-scope declarations; nstack records the list size at each startElement so endElement can roll back to the parent scope. namespace() now calls nsLookup() to find the currently in-scope URI for a prefix and only writes a declaration when the binding changes. This naturally handles xmlns="": if the ancestor has xmlns="http://foo.com" in scope, nsLookup("") returns that URI, which differs from "", so xmlns="" is emitted. As a side effect this also prevents redundant namespace re-declarations when the same prefix→URI binding is already in scope from an ancestor, laying the groundwork for fixing eXist-db#5790. Fixes 7 pre-existing test failures: - SerializationTest#xqueryUpdateNsTest (×2, local + remote) - ExpandTest#expandWithDefaultNS - XQueryTest#namespaceHandlingSameModule_1846228 - XQueryTest#doubleDefaultNamespace_1806901 - XQueryTest#wrongAddNamespace_1807014 - XQueryTest#modulesAndNS Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…ssues Add namespace validation to the DOM-based writeJsonElement() method in FunXmlToJson — elements must be in the http://www.w3.org/2005/xpath-functions namespace per W3C spec, raising FOJS0006 otherwise. The old XMLStreamReader path had this check but the newer DOM path was missing it. Resolve all 15 Codacy PMD issues flagged on PR eXist-db#6219: - Move field declarations to top of class (XHTMLWriter, FunXmlToJson) - Replace unnecessary fully qualified names (XHTMLWriter, XQueryContext, FunXmlToJson) - Add default case to switch statement (FunXmlToJson) - Remove unused local variable and import (HTML5FragmentTest) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace != with .equals() when comparing Integer objects in the map-key stack separator check. The != operator compared object references rather than values, which happened to work due to Integer caching for small values but is fragile and incorrect. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
XMLWriter.writeCharSeq() wrote output one character at a time via writer.write(ch.charAt(i)). For a 1KB run of safe characters this made 1024 separate Writer.write(int) calls instead of a single bulk write. Every text node, attribute value, namespace URI, and indent string in the serializer pipeline took this path. Round 1 — bulk write dispatch: - XMLWriter/TEXTWriter.writeCharSeq() now dispatches by type: String → writer.write(s, off, len), CharSlice → new CharSlice.write(writer, off, len), StringBuilder → getChars into cached scratch buffer then bulk write - Cached per-instance growable charBuffer for amortized allocation Round 2 — raw-text fast path: - New XMLWriter.needsEscaping(inAttribute) context predicate - HTML5Writer/XHTMLWriter override returns false inside <script>/<style> - writeChars() caches predicate once per call, skipping per-char specialChars check when false - closeStartTag write-call coalescence: 4 writes → 3 per element close Benchmark: 98.6% of output bytes now bulk-written (was 0%). 1,022 tests pass, 0 failures, 0 regressions. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Coalesce the ' ' + qname + '="' sequence into a single bulk Writer.write(char[], off, len) call using a per-instance 96-char scratch buffer. Reduces per-char writes from 81,200 to 65,200 on the 80-paragraph benchmark (round 3 of serialization speedup). Cumulative: 98.88% of output now bulk-written (was 0% before round 1), 1.98x speedup vs baseline on OutputStreamWriter(UTF-8). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…ocks, pattern matching Address reinhapa's review comments on PR eXist-db#6219: - SerializerUtils.java: convert to switch expression, eliminate temp var, merge STRING/DECIMAL/INTEGER cases - Option.java: extract local variables for prefix and namespaceURI - URLRewriteViewPipelineTest.java: convert string concatenation to text blocks - TEXTWriter.java: convert instanceof chain to Java 21 pattern-matching switch Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
PMD flagged 8 methods this branch substantially modified (AdaptiveWriter.write, XHTML5Writer.writeDoctype, XMLWriter namespace/writeDeclaration/writeChars, FunSerialize.normalize, JSON eval/readValue) above the 200 NPath threshold. Each method dispatches over a W3C XSLT/XQuery Serialization 3.1 spec rule set (adaptive item kinds, doctype/declaration emission rules, namespace fixup, character escaping, sequence normalization, JSON options/token kinds). Branch reorganization obscures the spec mapping; suppress with rationale comments instead. No behavior change. The remaining flagged methods on this branch are in pre-existing files only lightly touched (ElementConstructor +6, XQueryContext +60 in unrelated methods) and are out of scope. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Per the project convention, do not add @SuppressWarnings("PMD.NPathComplexity") annotations proactively. Let the reviewer decide whether to suppress or refactor. Removes the eight annotations across AdaptiveWriter.write, XHTML5Writer.writeDoctype, three methods in XMLWriter (namespace/writeDeclaration/writeChars), FunSerialize.normalize, and two methods in JSON.java. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Address reinhapa's review on PR eXist-db#6219: - Remove TEXTWriter.writeCharSeq() (duplicate of XMLWriter's). Promote XMLWriter.writeCharSeq() to protected so subclasses inherit it. The inherited version uses the pooled charBuffer rather than allocating a fresh array per call, so this is also a small allocation win on the text-output path. - Add javadoc to XMLWriter.charBuffer explaining that exclusive access is guaranteed by SerializerPool (Commons Pool2), so the unsynchronised field is safe by construction. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
reinhapa requested switch expression conversion at two sites in XMLWriter.java: - writeChars escape switch on `ch`: traditional case/break -> arrow - writeCharSeq type-pattern chain: if/else-if instanceof -> switch with type patterns Behavior unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Move DOCTYPE emission rules into XHTMLWriter so both XHTML4 and HTML4 share the same logic; consolidate the previously diverging XHTML5Writer override. Per W3C XSLT and XQuery Serialization 3.1 sections 7.1 and 7.2: - doctype-system set: emit DOCTYPE PUBLIC/SYSTEM - doctype-system absent, html method, doctype-public set: emit DOCTYPE PUBLIC - doctype-system absent, html-version >= 5: emit <!DOCTYPE html> - otherwise: no DOCTYPE Previously XHTMLWriter inherited XMLWriter's writeDoctype which emitted a DOCTYPE whenever either id was set, causing xhtml-25 to emit a stray DOCTYPE PUBLIC. XHTML5Writer's override suppressed <!DOCTYPE html> when doctype-public was set without doctype-system, which broke xhtml-27. isHtmlMethod and isHtml5Version are now protected (not private), and isHtml5Version reads html-version first, falling back to version per the W3C spec note for html method. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
XQueryContext.checkOptions resolved namespace prefixes only from
inScopeNamespaces, which contains element-constructor scoped namespaces
but NOT prologue declarations like `declare namespace p = "..."`.
Prologue namespaces are stored in staticNamespaces; getURIForPrefix is
the canonical accessor that consults inScope, inherited, and static
maps in turn.
This caused prefixed names in serialization options (e.g.
`declare option output:cdata-section-elements "p:b"`) to resolve their
prefix to a null URI, producing the QName "{null}b" which never matched
real elements during serialization.
Fixes XQTS QT4: method-xhtml -18, -19a, -19b, -19c (cdata-section-elements
on prefixed elements) and method-xml K2-Serialization-30. method-xhtml
now at 81.1% (43/53), method-xml at 80.9% (38/47), both above Phase 2 80%
gate.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Two PI serialization rules from W3C XSLT and XQuery Serialization: * HTML method (pre-HTML5, version < 5.0): processing instructions are serialized as `<?target data>` with no closing `?>` — § 7.1.5 of the XSLT and XQuery Serialization 3.1 spec. Previously XHTMLWriter inherited XML's `<?target data?>` form regardless of method. * HTML5 method (version 5.0): per QT4 PR2372, since HTML5 has no PI syntax, the serializer renders processing instructions as comments of the form `<!--?target data?-->`, matching the HTML5 parser's coercion of `<?...?>` content. Previously HTML5Writer emitted the pre-HTML5 form. Fixes XQTS QT4: method-html -48, -58, -59a (3 new passes). The XQ 3.0/3.1-only -59 case now regresses because the XQTS runner prepends `xquery version "4.0"` to every test and the new HTML5 PI form is the XQ 4.0 normative output; the older `<?pi data>` form survives only under XQ 3.x. Net for method-html: 24 → 22 fails (65.2% → 68.1%). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
When include-content-type=yes (the default), the serializer auto-emits a Content-Type / charset meta tag as the first child of <head>. If the input also contains an explicit `<meta charset>` or `<meta http-equiv="Content-Type">`, we ended up writing two metas in the output, which fails the XQTS regex checks of the form `not(meta.*meta)` and breaks W3C HTML/XHTML serialization compliance (PR2372). The fix diverts each candidate meta inside <head> to a scratch buffer at startElement time. attribute() inspects the captured attributes; if any of them is `charset` or `http-equiv="Content-Type"` (case-insensitive), the buffered meta is dropped at endElement time so the auto-emitted meta stands as the single Content-Type / charset element. Otherwise the buffer is flushed verbatim, preserving regular meta elements like `<meta name="description">`. HTML5Writer uses its own attribute() and short-circuits endElement() for void elements, so the dedup hooks (`noteMetaAttribute`, `endMetaBuffer`) are exposed as protected and called from HTML5Writer to keep the HTML5 output method on the same code path as HTML4/XHTML. Fixes XQTS QT4: method-html -34, -37a, -60 (3 new passes); method-xhtml -34, -37, -37a, -68 (4 new passes). method-xhtml now at 88.7% (6/53 fail). method-html at 72.5% (19/69 fail). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Brings method-html from 22F (68.1%) past the Phase 2 gate (≥80% AND ≤30F) to 10F (81.2%) on the QT4 serialization test set, with no regressions in method-json/xhtml/xml or in unit tests touching the HTML serializers. Five W3C XSLT/XQuery Serialization 3.1 § 7 conformance fixes: - HTML5Writer.attribute(): case-insensitive boolean attribute minimization per § 7.2.2 — `<option selected="SELECTED">` now serializes as `<option selected>` (Serialization-html-13). The matcher accepts empty values too. - XHTMLWriter / HTML5Writer attribute(): apply escape-uri-attributes (default `yes`) per § 7.2.5 to URI-valued attributes (a/@href, img/@src, link/@href, etc.). Only non-ASCII codepoints are %-encoded to UTF-8 — ASCII (incl. literal space) passes through to avoid double-encoding existing escape sequences. (Serialization-html-43, -44) - XHTMLWriter.shouldUseCdataSections(): for the html method, cdata-section- elements is ignored for HTML-namespaced elements but DOES apply to foreign content (§ 7.2.7). Foreign-namespaced elements bypass the xdm-serialization gate. (Serialization-html-18) - HTML5Writer.closeStartTag(): foreign content embedded in HTML5 is self-closed with `/>` instead of the `></tag>` expanded form, so consumers can re-parse the foreign block as XML. (Serialization-html-6) - HTML5Writer.namespace(): XHTML namespace declarations are still suppressed (HTML5 parser puts elements in the HTML namespace implicitly), but foreign-content namespace declarations are now emitted so SVG/MathML/custom-XML round-trip. (Serialization-html-19a-c) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Codacy round 2 follow-ups requested by reinhapa: - HTML5Writer.needsEscaping: collapse if/return into a single boolean expression (SimplifyBooleanReturns). - XHTMLWriter: hoist all fields above methods/constructors so the class layout passes FieldDeclarationsShouldBeAtStartOfClass. - XHTMLWriter.writeDoctype: extract isHtmlRoot, getDoctypeProperty, and emitHtmlDoctype helpers, dropping NPath complexity from 320 to within the 200 threshold. - XHTMLWriter.maybeEscapeUri: collapse the redundant nested null guard (CollapsibleIfStatements) -- the !isHtmlMethod() leg never triggered an early return, so the only effective gate was the currentTag null check. - XHTMLWriter.shouldUseCdataSections: simplify boolean return (SimplifyBooleanReturns). No behavioural change: the HTML/XHTML serializer test suites all pass (31 tests across HTML5WriterTest, HTML5FragmentTest, EXISerializerTest, SerializerPoolTest, DOMSerializerTest, XIncludeSerializerTest). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Two HTML5 XQSuite assertions in serialize.xql expected the legacy
XHTML/HTML4 meta form (<meta http-equiv="Content-Type"
content="text/html; charset=UTF-8">) but the HTML5 serializer correctly
emits the short HTML5 form (<meta charset="UTF-8">). The dedup logic
added in [bugfix] Suppress duplicate Content-Type/charset meta in
HTML/XHTML head exposed this mismatch.
Per XHTMLWriter.writeContentTypeMeta():
// HTML5 method uses <meta charset="UTF-8">
// XHTML and HTML4 use <meta http-equiv="Content-Type" ...>
Tests affected: ser:serialize-html-5-raw-text-elements-head and
ser:serialize-html-5-needs-escape-elements.
Per reinhapa's review on PR eXist-db#6346 (Codacy): - The localName-dispatch switch in writeJsonElement is now an arrow switch with per-case helpers (writeJsonMap, writeJsonArray, writeJsonString, writeJsonNumber, writeJsonBoolean, writeJsonNull); the default still raises FOJS0006. - The reader.getLocalName() switch inside the legacy nodeValueToJsonViaStream() START_ELEMENT branch is now arrow-form. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Addresses 4 PMD UncommentedEmptyMethodBody warnings flagged by Codacy on PR eXist-db#6346. The methods are intentional no-ops on instrumentation classes (CountingWriter, NullOutputStream); brief inline comments document the intent and clear the warnings. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
joewiz
force-pushed
the
extract/serialization-compliance
branch
from
9cd1bd3 to
f763a20
Compare
Member
Author
|
[This response was co-authored with Claude Code. -Joe] Rebased onto current develop (28 commits, clean — no conflicts) and addressed the 4 actionable Codacy warnings ( All 4 were The 5th warning ( Local verification: HtmlSerializerBenchmark 3/3 pass; force-pushed (new tip |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implements W3C XSLT and XQuery Serialization 3.1 (https://www.w3.org/TR/xslt-xquery-serialization-31/) compliance for the spec-mandated output methods: XML, HTML 5, XHTML, JSON, text, and adaptive. Extracts the W3C-mandated serialization commits from PR #6219 (
v2/serialization-compliance) ontodevelopper the 2026-05-10 v2/* extraction audit. This is the audit's #2 recommended extraction and the largest single XQ 3.1-mandatory lift available in the next-N queue.What's NOT in this PR
CSV serialization is not included. CSV is not in any W3C serialization spec — eXist borrowed it from BaseX. Per the 2026-05-10 audit's calibration, it's classified as eXist-extension (lower priority than 3.1-mandatory work) and is left for a separate post-7.0 PR if scoped. The audit verified no CSV files appear in this extraction's diff, so no carve-out was needed.
What changed
27 commits (26 cherry-picked from #6219, plus 1 follow-up test fix) across 27 files in
exist-core. Per output method:IndentingXMLWriter,XMLWriter— namespace stack discipline (xmlns=""undeclaration), attribute prefix coalescence, raw-text fast path, CDATA-section-elements via static namespaces, support for XML 1.1 namespace undeclaration in element constructors.HTML5Writer— spec-compliant DOCTYPE, fragment serialization, raw-text element handling for<script>/<style>/<title>/<textarea>, PI serialization per W3C XSL/XQuery Serialization 3.1 §7 and HTML5 PR2372, dedup of duplicate Content-Type/charset meta, method-html QT4 conformance fixes.XHTMLWriter,XHTML5Writer— DOCTYPE, fragment handling, regression test for URL-rewrite view pipeline.fn:serialize,fn:xml-to-json,fn:json-to-xml):JSONSerializer,FunXmlToJson,JSON— namespace validation, map-stack Integer-reference fix, character maps, adaptive prefix.AdaptiveWriter,XQuerySerializer— compliance with §10 of the Serialization spec.TEXTWriter— bulk-write fast path.AbstractSerializer,XQuerySerializer,SerializerUtils,EXistOutputKeys,Option,XQueryContext—parameter-documentserialization parameter, character-map support, parameter handling.<meta charset>form.The branch is rebased on top of
4f09d0accc(currentorigin/developtip).Spec references
fn:serialize): https://www.w3.org/TR/xpath-functions-31/#func-serializefn:xml-to-json,fn:json-to-xml,fn:parse-json): https://www.w3.org/TR/xpath-functions-31/#jsonXQTS XQ 3.1 deltas
Measured 2026-05-11 against the 2026-05-10 canonical 3.1 baseline (24,105 / 26,090 = 92.4% on commit
a8db3dd394, --xqts-version 3.1, patched runner frombugfix/applyVersionHint-cap-at-3.1). Verifiable per-test-set lifts on serialization-mandated surfaces:misc-Serializationfn-format-datefn-format-dateTimefn-format-timefn-format-numberfn-parse-jsonThese deltas fall within the audit's predicted +80-130 lift. Additional spillover gains in
prod-DirElemContent.namespace(+15),prod-CompAttrConstructor(+19),prod-CompElemConstructor(+6), andprod-CompDocConstructor(+11) are driven by the namespace / element-constructor changes shipped here. No serialization-set regressions.fn-serialize-jsonstays at 0/40: this is a W3C catalog issue (tests use the deprecated:=map-expression syntax which the eXist 3.1 parser rejects), not a serializer behaviour problem and out of scope for this PR.Test plan
*Serialize*,*Output*,*Json*,*Format*,HTML5*,XHTML*,XmlToJson*,XmlWriter*,URLRewrite*): 45 / 45 passxquery.xquery3.XQuery3Tests: 1019 / 1020 pass (1 pre-existing skip), 0 failures after correcting two stale HTML5<meta charset>assertions (final commit on this branch)The full-module
mvn test -pl exist-coregate was attempted but hit BrokerPool contention from a concurrent parallel-session test run; the failures observed (XMLDBRestoreTest,DocumentUpdateTest,SaxonConfigTest,ValueIndexByQNameTestetc., all sub-second errors) match the concurrency-hang shape, not serializer regressions. The XQSuite + targeted-JUnit + XQTS gates above cover the serialization surface this PR actually touches.Source / supersession
Cherry-picked from
joewiz:v2/serialization-compliance(PR #6219). After this PR merges, PR #6219 should be closed as superseded. CSV-serialization commits (if/when desired) would land as their own follow-up.🤖 Generated with Claude Code