jtlt 0.3.0 → 0.5.0

package/src/StringJoiningTransformer.js

@@ -13,7 +13,8 @@ import AbstractJoiningTransformer from './AbstractJoiningTransformer.js';
  *   mediaType?: string,
  *   version?: string,
  *   standalone?: boolean,
- *   method?: "xml"|"html"|"text"|"json"|"xhtml"
+ *   method?: "xml"|"html"|"text"|"json"|"xhtml",
+ *   useCharacterMaps?: string[]
  * }} OutputConfig
  */
 
@@ -434,20 +435,6 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
-  /**
-   * @param {OutputConfig} cfg
-   * @returns {StringJoiningTransformer}
-   */
-  output (cfg) {
-    // We wait until first element is set in `element()` to add
-    //   XML declaration and DOCTYPE as latter depends on root element
-    this._outputConfig = cfg;
-
-    // Use for file extension if making downloadable?
-    this.mediaType = cfg.mediaType;
-    return this;
-  }
-
   /**
    * @param {string|Element} elName - Element name or element object
    * @param {ElementAttributes} [atts] - Element attributes
@@ -570,7 +557,9 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     }
     if (childNodes && childNodes.length) {
       this._openTagState = false;
-      this.append(jml[method]({'#': childNodes}));
+      this.append(this._replaceCharacterMaps(
+        jml[method]({'#': childNodes})
+      ));
     }
     cb.call(this);
 
@@ -585,6 +574,17 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
+  /**
+   * @param {string} prefix
+   * @param {string} namespaceURI
+   * @returns {StringJoiningTransformer}
+   */
+  namespace (prefix, namespaceURI) {
+    this.append(' xmlns:' + prefix + '="' +
+        this._replaceCharacterMaps(namespaceURI) + '"');
+    return this;
+  }
+
   /**
    * @param {string} name - Attribute name
    * @param {string|Record<string, unknown>|
@@ -648,7 +648,7 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     val = (this._cfg.preEscapedAttributes || avoidAttEscape)
       ? valStr
       : valStr.replaceAll('&', '&amp;').replaceAll('"', '&quot;');
-    this.append(' ' + name + '="' + val + '"');
+    this.append(' ' + name + '="' + this._replaceCharacterMaps(val) + '"');
     return this;
   }
 
@@ -663,7 +663,11 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
       this.append('>');
       this._openTagState = false;
     }
-    this.append(txt.replaceAll('&', '&amp;').replaceAll('<', '&lt;'));
+    this.append(
+      this._replaceCharacterMaps(
+        txt
+      ).replaceAll('&', '&amp;').replaceAll('<', '&lt;')
+    );
     return this;
   }
 
@@ -734,7 +738,7 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     // Save current state
     /** @type {any} */
     const oldRoot = this.root;
-    /** @type {any} */
+    /** @type {OutputConfig|undefined} */
     const oldOutputConfig = this._outputConfig;
     const oldStr = this._str;
     /** @type {any} */
@@ -742,7 +746,7 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
 
     // Reset state for new document
     this.root = undefined;
-    /** @type {any} */
+    /** @type {OutputConfig} */
     this._outputConfig = cfg;
     this._str = '';
     this._openTagState = false;
@@ -795,7 +799,7 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
 
     // Reset state for new document
     this.root = undefined;
-    /** @type {any} */
+    /** @type {OutputConfig} */
     this._outputConfig = cfg;
     this._str = '';
     this._openTagState = false;

package/src/XPathTransformer.js

@@ -6,7 +6,7 @@ import XPathTransformerContext from './XPathTransformerContext.js';
  * @property {boolean} [errorOnEqualPriority] Throw on equal priority
  * @property {import('./index.js').
  *   XPathTemplateArray<T>} templates Template objects
- * @property {number} [xpathVersion] XPath version (1|2)
+ * @property {number} [xpathVersion] XPath version (1|2|3.1)
  */
 
 /**
@@ -83,6 +83,8 @@ class XPathTransformer {
     if (len > 1) {
       this._triggerEqualPriorityError();
     }
+    // Set up parameter context for valueOf() access in root template
+    xte._params = {0: xte._contextNode};
     const ret = templateObj.template.call(xte, undefined, {mode});
     if (typeof ret !== 'undefined') {
       /** @type {any} */ (xte)._getJoiningTransformer().append(ret);