xslt-processor 5.0.3 → 5.0.5

package/README.md

@@ -296,7 +296,7 @@ console.log(result2); // "<users><user>John</user></users>" (XML)
 You can simply add a tag like this:
 
 ```html
-<script type="application/javascript" src="https://unpkg.com/xslt-processor@latest/umd/xslt-processor.global.js"></script>
+<script type="application/javascript" src="https://unpkg.com/xslt-processor@latest/dist/umd/xslt-processor.global.js"></script>
 ```
 
 All the exports will live under `globalThis.XsltProcessor` and `window.XsltProcessor`. [See a usage example here](https://github.com/DesignLiquido/xslt-processor/blob/main/interactive-tests/xslt.html).

package/dist/README.md

@@ -296,7 +296,7 @@ console.log(result2); // "<users><user>John</user></users>" (XML)
 You can simply add a tag like this:
 
 ```html
-<script type="application/javascript" src="https://unpkg.com/xslt-processor@latest/umd/xslt-processor.global.js"></script>
+<script type="application/javascript" src="https://unpkg.com/xslt-processor@latest/dist/umd/xslt-processor.global.js"></script>
 ```
 
 All the exports will live under `globalThis.XsltProcessor` and `window.XsltProcessor`. [See a usage example here](https://github.com/DesignLiquido/xslt-processor/blob/main/interactive-tests/xslt.html).

package/dist/index.d.mts

@@ -1263,6 +1263,12 @@ declare class Xslt {
      * @param template The template.
      */
     protected xsltKey(context: ExprContext, template: XNode): void;
+    /**
+     * Returns all descendant nodes of the given node, depth-first.
+     * @param node The root node to traverse from.
+     * @returns All descendant nodes.
+     */
+    private collectAllDescendants;
     /**
      * Implements `xsl:message`.
      * Outputs a message to the console. If terminate="yes", throws an error to stop processing.

package/dist/index.d.ts

@@ -1263,6 +1263,12 @@ declare class Xslt {
      * @param template The template.
      */
     protected xsltKey(context: ExprContext, template: XNode): void;
+    /**
+     * Returns all descendant nodes of the given node, depth-first.
+     * @param node The root node to traverse from.
+     * @returns All descendant nodes.
+     */
+    private collectAllDescendants;
     /**
      * Implements `xsl:message`.
      * Outputs a message to the console. If terminate="yes", throws an error to stop processing.

package/dist/index.js

@@ -6328,9 +6328,9 @@ var init_function_call_expression = __esm({
           case "concat":
             return evaluatedArgs.map((arg) => this.convertToString(arg)).join("");
           case "starts-with":
-            return String(evaluatedArgs[0]).startsWith(String(evaluatedArgs[1]));
+            return this.convertToString(evaluatedArgs[0]).startsWith(this.convertToString(evaluatedArgs[1]));
           case "contains":
-            return String(evaluatedArgs[0]).includes(String(evaluatedArgs[1]));
+            return this.convertToString(evaluatedArgs[0]).includes(this.convertToString(evaluatedArgs[1]));
           case "substring-before":
             return this.substringBefore(evaluatedArgs);
           case "substring-after":
@@ -6476,13 +6476,13 @@ var init_function_call_expression = __esm({
         return Number(value);
       }
       stringValue(args, context) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (args.length === 0) {
           return (_b = (_a = context.node) == null ? void 0 : _a.textContent) != null ? _b : "";
         }
         const value = args[0];
         if (Array.isArray(value) && value.length > 0) {
-          return (_d = (_c = value[0]) == null ? void 0 : _c.textContent) != null ? _d : String(value[0]);
+          return this.getNodeStringValue(value[0]);
         }
         return String(value);
       }
@@ -6515,6 +6515,9 @@ var init_function_call_expression = __esm({
         if (!node) {
           return "";
         }
+        if (typeof node === "string") return node;
+        if (typeof node === "number") return String(node);
+        if (typeof node === "boolean") return node ? "true" : "false";
         if (typeof node.textContent === "string") {
           return node.textContent;
         }
@@ -6552,26 +6555,26 @@ var init_function_call_expression = __esm({
         if (args.length === 0) {
           return this.stringValue([], context).length;
         }
-        return String(args[0]).length;
+        return this.convertToString(args[0]).length;
       }
       normalizeSpace(args, context) {
-        const str = args.length === 0 ? this.stringValue([], context) : String(args[0]);
+        const str = args.length === 0 ? this.stringValue([], context) : this.convertToString(args[0]);
         return str.trim().replace(/\s+/g, " ");
       }
       substringBefore(args) {
-        const str = String(args[0]);
-        const search = String(args[1]);
+        const str = this.convertToString(args[0]);
+        const search = this.convertToString(args[1]);
         const index = str.indexOf(search);
         return index === -1 ? "" : str.substring(0, index);
       }
       substringAfter(args) {
-        const str = String(args[0]);
-        const search = String(args[1]);
+        const str = this.convertToString(args[0]);
+        const search = this.convertToString(args[1]);
         const index = str.indexOf(search);
         return index === -1 ? "" : str.substring(index + search.length);
       }
       substring(args) {
-        const str = String(args[0]);
+        const str = this.convertToString(args[0]);
         const start = Math.round(Number(args[1])) - 1;
         if (args.length === 2) {
           return str.substring(Math.max(0, start));
@@ -6585,9 +6588,9 @@ var init_function_call_expression = __esm({
         return str.substring(adjustedStart, adjustedStart + adjustedLength);
       }
       translate(args) {
-        const str = String(args[0]);
-        const from = String(args[1]);
-        const to = String(args[2]);
+        const str = this.convertToString(args[0]);
+        const from = this.convertToString(args[1]);
+        const to = this.convertToString(args[2]);
         let result = "";
         for (const char of str) {
           const index = from.indexOf(char);
@@ -6625,7 +6628,7 @@ var init_function_call_expression = __esm({
         if (!Array.isArray(nodeSet)) return 0;
         return nodeSet.reduce((acc, node) => {
           var _a;
-          const value = Number((_a = node == null ? void 0 : node.textContent) != null ? _a : node);
+          const value = Number((_a = node == null ? void 0 : node.textContent) != null ? _a : this.getNodeStringValue(node));
           return acc + (isNaN(value) ? 0 : value);
         }, 0);
       }
@@ -14540,7 +14543,7 @@ var Xslt = class {
         return;
       }
       const childNodes = node.childNodes.filter(
-        (n) => n.nodeType !== DOM_ATTRIBUTE_NODE
+        (n) => n.nodeType !== DOM_ATTRIBUTE_NODE && n.nodeName !== "#dtd-section"
       );
       for (const childNode of childNodes) {
         if (childNode.nodeType === DOM_TEXT_NODE) {
@@ -16226,23 +16229,36 @@ var Xslt = class {
       errorMessage = errorMessage.slice(0, -2);
       throw new Error(errorMessage);
     }
-    let keyContext;
-    if (context.nodeList[context.position].nodeName === "#document") {
-      keyContext = context.clone(context.nodeList[context.position].childNodes);
-    } else {
-      keyContext = context;
-    }
-    const nodes = this.xsltMatch(match, keyContext);
     if (!(name in context.keys)) {
       context.keys[name] = {};
     }
-    for (const node of nodes) {
-      const nodeContext = context.clone([node]);
-      const attribute = this.xPath.xPathEval(use, nodeContext);
-      const attributeValue = attribute.stringValue();
-      context.keys[name][attributeValue] = new NodeSetValue([node]);
+    const allNodes = this.collectAllDescendants(context.root);
+    for (const node of allNodes) {
+      if (nodeMatchesPattern(node, match, context, this.matchResolver, this.xPath)) {
+        const nodeContext = context.clone([node]);
+        const attribute = this.xPath.xPathEval(use, nodeContext);
+        const attributeValue = attribute.stringValue();
+        if (!(attributeValue in context.keys[name])) {
+          context.keys[name][attributeValue] = new NodeSetValue([node]);
+        } else {
+          context.keys[name][attributeValue].nodeSetValue().push(node);
+        }
+      }
     }
   }
+  /**
+   * Returns all descendant nodes of the given node, depth-first.
+   * @param node The root node to traverse from.
+   * @returns All descendant nodes.
+   */
+  collectAllDescendants(node) {
+    const result = [];
+    for (const child of node.childNodes || []) {
+      result.push(child);
+      result.push(...this.collectAllDescendants(child));
+    }
+    return result;
+  }
   /**
    * Implements `xsl:message`.
    * Outputs a message to the console. If terminate="yes", throws an error to stop processing.
@@ -16964,7 +16980,7 @@ var Xslt = class {
    */
   xsltTransformOrStylesheet(context, template, output) {
     return __async(this, null, function* () {
-      var _a, _b, _c;
+      var _a;
       const mainStylesheetMetadata = {
         importDepth: 0,
         href: "(main stylesheet)",
@@ -17055,80 +17071,8 @@ var Xslt = class {
           this.currentTemplateStack.pop();
         } else {
           const rootNode = context.nodeList[context.position];
-          if (rootNode && rootNode.childNodes && rootNode.childNodes.length > 0) {
-            const childNodes = rootNode.childNodes.filter((n) => n.nodeName !== "#dtd-section");
-            if (childNodes.length > 0) {
-              const childContext = context.clone(childNodes);
-              for (let j = 0; j < childContext.contextSize(); ++j) {
-                const currentNode = childContext.nodeList[j];
-                if (currentNode.nodeType === DOM_TEXT_NODE) {
-                  const textNodeContext = context.clone([currentNode], 0);
-                  this.commonLogicTextNode(textNodeContext, currentNode, output);
-                } else {
-                  const clonedContext = childContext.clone([currentNode], 0);
-                  const selection = selectBestTemplate(
-                    expandedTemplates,
-                    clonedContext,
-                    this.matchResolver,
-                    this.xPath,
-                    this.warningsCallback
-                  );
-                  if (selection.selectedTemplate) {
-                    const templateContext = clonedContext.clone([currentNode], 0);
-                    templateContext.inApplyTemplates = true;
-                    const metadata = this.templateSourceMap.get(selection.selectedTemplate);
-                    const matchPattern = xmlGetAttribute(selection.selectedTemplate, "match");
-                    const modeAttr = xmlGetAttribute(selection.selectedTemplate, "mode");
-                    this.currentTemplateStack.push({
-                      template: selection.selectedTemplate,
-                      stylesheetDepth: (_b = metadata == null ? void 0 : metadata.importDepth) != null ? _b : 0,
-                      mode: modeAttr || null,
-                      match: matchPattern
-                    });
-                    yield this.xsltChildNodes(templateContext, selection.selectedTemplate, output);
-                    this.currentTemplateStack.pop();
-                  } else {
-                    if (currentNode.childNodes && currentNode.childNodes.length > 0) {
-                      const grandchildNodes = currentNode.childNodes.filter((n) => n.nodeName !== "#dtd-section");
-                      if (grandchildNodes.length > 0) {
-                        const grandchildContext = context.clone(grandchildNodes);
-                        for (let k = 0; k < grandchildContext.contextSize(); ++k) {
-                          const grandchildNode = grandchildContext.nodeList[k];
-                          if (grandchildNode.nodeType === DOM_TEXT_NODE) {
-                            const textNodeContext = context.clone([grandchildNode], 0);
-                            this.commonLogicTextNode(textNodeContext, grandchildNode, output);
-                          } else {
-                            const grandchildClonedContext = grandchildContext.clone([grandchildNode], 0);
-                            const grandchildSelection = selectBestTemplate(
-                              expandedTemplates,
-                              grandchildClonedContext,
-                              this.matchResolver,
-                              this.xPath,
-                              this.warningsCallback
-                            );
-                            if (grandchildSelection.selectedTemplate) {
-                              const grandchildTemplateContext = grandchildClonedContext.clone([grandchildNode], 0);
-                              grandchildTemplateContext.inApplyTemplates = true;
-                              const metadata = this.templateSourceMap.get(grandchildSelection.selectedTemplate);
-                              const matchPattern = xmlGetAttribute(grandchildSelection.selectedTemplate, "match");
-                              const modeAttr = xmlGetAttribute(grandchildSelection.selectedTemplate, "mode");
-                              this.currentTemplateStack.push({
-                                template: grandchildSelection.selectedTemplate,
-                                stylesheetDepth: (_c = metadata == null ? void 0 : metadata.importDepth) != null ? _c : 0,
-                                mode: modeAttr || null,
-                                match: matchPattern
-                              });
-                              yield this.xsltChildNodes(grandchildTemplateContext, grandchildSelection.selectedTemplate, output);
-                              this.currentTemplateStack.pop();
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
+          if (rootNode) {
+            yield this.applyBuiltInTemplate(rootNode, expandedTemplates, null, context, output);
           }
         }
       }