@tradik/xslt-processor 1.1.1 → 1.3.0

package/src/xslt/whitespace.js

@@ -9,37 +9,47 @@
 
 "use strict";
 
+import { isTextContinuation, isTextNode } from "../xpath/axes.js";
+import { matchesNameTest, nameTestPriority } from "./spaceNameTests.js";
+
 /** Node type of a document type declaration, which cannot be imported. */
 const DOCUMENT_TYPE_NODE = 10;
 
+/** Text made only of XML whitespace: #x20, #x9, #xD and #xA (not NBSP). */
+const XML_WHITESPACE_ONLY = /^[ \t\r\n]*$/;
+
 /**
- * Compute the XSLT default priority of an element name test.
+ * Whether a string consists of XML whitespace only (XML 1.0 production S).
+ * Unlike `trim()` and `\s`, a no-break space is not whitespace.
  *
- * @param {string} nameTest - A name test such as `*`, `ns:*` or `item`
- * @returns {number} The default priority
+ * @param {string} text - Any string
+ * @returns {boolean} True for "" and strings of #x20 #x9 #xD #xA
+ *
+ * @example
+ * isXmlWhitespace(" \n"); // true
+ * isXmlWhitespace("\u00a0"); // false
  */
-function nameTestPriority(nameTest) {
-  if (nameTest === "*") return -0.5;
-  if (nameTest.endsWith(":*")) return -0.25;
-  return 0;
+export function isXmlWhitespace(text) {
+  return XML_WHITESPACE_ONLY.test(text);
 }
 
 /**
- * Check whether an element matches a name test.
+ * The DOM nodes of the text run starting at a node: the node and every
+ * directly following Text/CDATA sibling (one XPath text node).
  *
- * @param {Element} element - The element to test
- * @param {string} nameTest - A name test such as `*`, `ns:*` or `item`
- * @returns {boolean} True when the element matches
+ * @param {Node} first - The first node of the run
+ * @returns {Node[]} The nodes of the run
  */
-function matchesNameTest(element, nameTest) {
-  if (nameTest === "*") return true;
-
-  if (nameTest.endsWith(":*")) {
-    const prefix = nameTest.slice(0, -2);
-    return element.nodeName.startsWith(`${prefix}:`);
+export function textRun(first) {
+  const run = [first];
+  for (
+    let next = first.nextSibling;
+    isTextNode(next);
+    next = next.nextSibling
+  ) {
+    run.push(next);
   }
-
-  return element.nodeName === nameTest || element.localName === nameTest;
+  return run;
 }
 
 /**
@@ -47,8 +57,11 @@ function matchesNameTest(element, nameTest) {
  */
 export class WhitespaceFilter {
   /**
-   * @param {string[]} [stripSpace] - Name tests from `xsl:strip-space`
-   * @param {string[]} [preserveSpace] - Name tests from `xsl:preserve-space`
+   * @param {Array<string|import('./spaceNameTests.js').ElementNameTest>} [stripSpace] -
+   *   Name tests from `xsl:strip-space`: expanded (see spaceNameTests.js),
+   *   or strings matched by their lexical name
+   * @param {Array<string|import('./spaceNameTests.js').ElementNameTest>} [preserveSpace] -
+   *   Name tests from `xsl:preserve-space`
    */
   constructor(stripSpace = [], preserveSpace = []) {
     this.stripSpace = stripSpace;
@@ -121,7 +134,8 @@ function hasXmlSpacePreserve(node) {
 }
 
 /**
- * Remove whitespace-only text nodes from a subtree.
+ * Remove whitespace-only text nodes from a subtree. Adjacent Text/CDATA
+ * nodes form one text node and are only removed together.
  *
  * @param {Node} root - The root of the subtree to prune
  * @param {WhitespaceFilter} filter - The configured filter
@@ -135,14 +149,16 @@ function pruneWhitespace(root, filter) {
     const current = stack.pop();
 
     if (
-      (current.nodeType === 3 || current.nodeType === 4) &&
-      current.nodeValue !== null &&
-      current.nodeValue.trim() === "" &&
+      isTextNode(current) &&
+      !isTextContinuation(current) &&
       current.parentNode?.nodeType === 1 &&
       filter.isStripped(current.parentNode) &&
       !hasXmlSpacePreserve(current.parentNode)
     ) {
-      doomed.push(current);
+      const run = textRun(current);
+      if (run.every((node) => isXmlWhitespace(node.nodeValue))) {
+        doomed.push(...run);
+      }
     }
 
     const children = current.childNodes;
@@ -151,7 +167,7 @@ function pruneWhitespace(root, filter) {
     }
   }
 
-  for (const node of doomed) node.remove();
+  for (const node of doomed) node.parentNode.removeChild(node);
 }
 
 /**

package/LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2026, XSLT-Processor Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.