jtlt 0.4.0 → 0.6.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
  */
 
@@ -172,6 +173,16 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
+  /**
+   * Alias for propValue(). Set a key-value pair in the current map/object.
+   * @param {string} prop - Property name
+   * @param {any} val - Property value
+   * @returns {StringJoiningTransformer}
+   */
+  mapEntry (prop, val) {
+    return this.propValue(prop, val);
+  }
+
   /**
    * @param {string} prop - Property name
    * @param {(this: StringJoiningTransformer) => void} cb - Callback function
@@ -257,6 +268,18 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
+  /**
+   * Alias for object(). Build an object/map.
+   * @param {Record<string, unknown>|Element} obj - Object to serialize
+   * @param {(this: StringJoiningTransformer) => void} cb - Callback function
+   * @param {any[]} [usePropertySets] - Property sets to use
+   * @param {Record<string, unknown>} [propSets] - Additional property sets
+   * @returns {StringJoiningTransformer}
+   */
+  map (obj, cb, usePropertySets, propSets) {
+    return this.object(obj, cb, usePropertySets, propSets);
+  }
+
   /**
    * @param {any[]|Element} [arr] - Array to serialize
    * @param {(this: StringJoiningTransformer) => void} [cb] - Callback function
@@ -434,28 +457,15 @@ 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
    * @param {any[]} [childNodes] - Child nodes
    * @param {(this: StringJoiningTransformer) => void} [cb] - Callback function
+   * @param {string[]} [useAttributeSets] - Attribute set names to apply
    * @returns {StringJoiningTransformer}
    */
-  element (elName, atts, childNodes, cb) {
+  element (elName, atts, childNodes, cb, useAttributeSets) {
     // If a parent element's start tag is still open, close it before
     // starting a new element to ensure valid nesting.
     if (this._openTagState) {
@@ -554,6 +564,17 @@ class StringJoiningTransformer extends AbstractJoiningTransformer {
       elName = elObj.nodeName;
     }
 
+    // Apply attribute sets if specified
+    if (useAttributeSets && useAttributeSets.length) {
+      const mergedAtts = {};
+      useAttributeSets.forEach((setName) => {
+        if (this._attributeSet[setName]) {
+          Object.assign(mergedAtts, this._attributeSet[setName]);
+        }
+      });
+      atts = Object.assign(mergedAtts, atts);
+    }
+
     this.append('<' + elName);
     /** @type {any} */
     const oldTagState = this._openTagState;
@@ -570,7 +591,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 +608,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 +682,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 +697,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 +772,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 +780,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 +833,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

@@ -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);