jtlt 0.4.0 → 0.6.0

package/src/JSONJoiningTransformer.js

@@ -36,7 +36,7 @@ function _makeDatasetAttribute (n0) {
  * plus special helpers: dataset (object) and $a (ordered attribute array).
  * @typedef {Record<string, unknown> & {
  *   dataset?: Record<string, string>,
- *   $a?: Array<[string, string]>
+ *   $a?: [string, string][]
  * }} ElementAttributes
  */
 
@@ -142,6 +142,16 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     (/** @type {Record<string, any>} */ (this._obj))[prop] = val;
   }
 
+  /**
+   * Alias for propValue(). Set a key-value pair in the current map/object.
+   * @param {string} prop - Property name
+   * @param {any} val - Property value
+   * @returns {void}
+   */
+  mapEntry (prop, val) {
+    return this.propValue(prop, val);
+  }
+
   /* c8 ignore next 13 -- JSDoc block incorrectly counted as coverable by c8 */
   /**
    * @param {Record<string, unknown>|ObjectCallback} [objOrCb]
@@ -207,6 +217,22 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
+  /**
+   * Alias for object(). Build an object/map.
+   * @param {Record<string, unknown>|ObjectCallback} [objOrCb]
+   *   Seed object or callback.
+   * @param {ObjectCallback|any[]} [cbOrUsePropertySets] Callback or sets.
+   * @param {any[]|Record<string, unknown>} [usePropertySetsOrPropSets]
+   *   Sets or prop sets.
+   * @param {Record<string, unknown>} [propSets] Key-value pairs to add.
+   * @returns {JSONJoiningTransformer}
+   */
+  map (objOrCb, cbOrUsePropertySets, usePropertySetsOrPropSets, propSets) {
+    return this.object(
+      objOrCb, cbOrUsePropertySets, usePropertySetsOrPropSets, propSets
+    );
+  }
+
   /**
    * Creates a new array and executes a callback in its context.
    * @param {any[]|ArrayCallback} [arrOrCb] Seed array or callback.
@@ -329,20 +355,6 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
-  /**
-   * @param {import('./StringJoiningTransformer.js').OutputConfig} cfg
-   * @returns {JSONJoiningTransformer}
-   */
-  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;
-  }
-
   /**
    * Build a Jamilih-style element JSON array and append to current container.
    * Result form: ['tag', {attr: 'val'}, child1, child2, ...]
@@ -353,9 +365,10 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
    *   Attrs, children, or cb.
    * @param {any[]|SimpleCallback} [childNodes] Children or cb.
    * @param {SimpleCallback} [cb] Builder callback.
+   * @param {string[]} [useAttributeSets] - Attribute set names to apply
    * @returns {JSONJoiningTransformer}
    */
-  element (elName, atts, childNodes, cb) {
+  element (elName, atts, childNodes, cb, useAttributeSets) {
     this._requireSameChildren('json', 'element');
     const isRoot = !this.root;
     if (isRoot) {
@@ -393,6 +406,17 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     /** @type {import('jamilih').JamilihChildren} */
     const jmlChildren = [];
 
+    // Apply attribute sets if specified
+    if (useAttributeSets && useAttributeSets.length) {
+      const mergedAtts = {};
+      useAttributeSets.forEach((setName) => {
+        if (this._attributeSet[setName]) {
+          Object.assign(mergedAtts, this._attributeSet[setName]);
+        }
+      });
+      attsObj = Object.assign(mergedAtts, attsObj);
+    }
+
     // Preprocess special attribute helpers present directly on attsObj
     if (attsObj.dataset && typeof attsObj.dataset === 'object' &&
       !Array.isArray(attsObj.dataset)
@@ -401,23 +425,35 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       for (const k in ds) {
         if (Object.hasOwn(ds, k)) {
           const dashed = k.replaceAll(camelCase, _makeDatasetAttribute);
-          attsObj['data-' + dashed] = ds[k];
+          attsObj['data-' + dashed] = this._replaceCharacterMaps(ds[k]);
         }
       }
       delete attsObj.dataset;
     }
     if (Array.isArray(attsObj.$a)) {
-      (/** @type {unknown[][]} */ (attsObj.$a)).forEach((pair) => {
+      attsObj.$a.forEach((pair) => {
         if (Array.isArray(pair) && pair.length > 1) {
-          attsObj[String(pair[0])] = pair[1];
+          attsObj[String(pair[0])] = this._replaceCharacterMaps(pair[1]);
         }
       });
       delete attsObj.$a;
     }
 
+    // Apply character maps to all regular attribute values
+    for (const key in attsObj) {
+      if (Object.hasOwn(attsObj, key) && typeof attsObj[key] === 'string') {
+        attsObj[key] = this._replaceCharacterMaps(attsObj[key]);
+      }
+    }
+
     // If children provided as array, copy (may be primitives or nested JML)
     if (Array.isArray(childNodes) && childNodes.length) {
-      jmlChildren.push(...childNodes);
+      jmlChildren.push(...childNodes.map((childNode) => {
+        if (typeof childNode === 'string') {
+          return this._replaceCharacterMaps(childNode);
+        }
+        return childNode;
+      }));
     }
 
     // Callback-driven building (attribute/text/nested element mutate stack)
@@ -435,9 +471,10 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     /** @type {any[]} */
     const jmlEl = [elementName];
     if (Object.keys(attsObj).length) {
-      jmlEl.push(attsObj);
+      jmlEl.push(attsObj, jmlChildren);
+    } else {
+      jmlEl.push(jmlChildren);
     }
-    jmlEl.push(...jmlChildren);
 
     if (isRoot) {
       // todo: indent, cdataSectionElements
@@ -490,6 +527,29 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
+  /**
+   * @param {string} prefix
+   * @param {string} namespaceURI
+   * @returns {JSONJoiningTransformer}
+   */
+  namespace (prefix, namespaceURI) {
+    if (!this._elementStack.length) {
+      // No-op outside an element() callback (JSON joiner semantics)
+      return this;
+    }
+    const top = /** @type {ElementInfo} */ (this._elementStack.at(-1));
+    const {attsObj} = top;
+
+    if (!attsObj.xmlns) {
+      attsObj.xmlns = {};
+    }
+
+    /** @type {Record<string, string>} */
+    (attsObj.xmlns)[prefix] = this._replaceCharacterMaps(namespaceURI);
+
+    return this;
+  }
+
   /**
    * Adds/updates an attribute for the most recently open element built via
    * a callback-driven element(). When not in an element callback context,
@@ -513,20 +573,22 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       for (const k in datasetObj) {
         if (Object.hasOwn(datasetObj, k)) {
           const dashed = k.replaceAll(camelCase, _makeDatasetAttribute);
-          attsObj['data-' + dashed] = datasetObj[k];
+          attsObj['data-' + dashed] = this._replaceCharacterMaps(
+            /** @type {string} */ (datasetObj[k])
+          );
         }
       }
       return this;
     }
     if (name === '$a' && Array.isArray(val)) {
-      (/** @type {unknown[][]} */ (val)).forEach((pair) => {
+      val.forEach((pair) => {
         if (Array.isArray(pair) && pair.length > 1) {
-          attsObj[String(pair[0])] = pair[1];
+          attsObj[String(pair[0])] = this._replaceCharacterMaps(pair[1]);
         }
       });
       return this;
     }
-    attsObj[name] = val;
+    attsObj[name] = this._replaceCharacterMaps(/** @type {string} */ (val));
     return this;
   }
 
@@ -578,7 +640,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     if (this._elementStack.length) {
       const top = /** @type {ElementInfo} */ (this._elementStack.at(-1));
       const {jmlChildren} = top;
-      jmlChildren.push(['!', txt]);
+      jmlChildren.push(this._replaceCharacterMaps(txt));
       return this;
     }
     // No-op outside element context in JSON joiner

package/src/JSONPathTransformer.js

@@ -70,6 +70,8 @@ class JSONPathTransformer {
     if (len > 1) {
       this._triggerEqualPriorityError();
     }
+    // Set up parameter context for valueOf() access in root template
+    jte._params = {0: jte._contextObj};
     const ret = /** @type {import('./index.js').JSONPathTemplateObject<T>} */ (
       templateObj
     ).template.call(jte, undefined, {mode});