jtlt 0.12.0 → 0.13.0

package/eslint.config.js

@@ -16,12 +16,17 @@ export default [
 
       // Temporary only:
       'no-unused-vars': 0,
+      'unicorn/prefer-private-class-fields': 0,
+      'unicorn/no-undeclared-class-members': 0,
 
       // AI was frequently making egregious mistakes here, so make fixable
       'jsdoc/check-alignment': 'error',
 
       // We frequently use callbacks for nested interactions
-      'promise/prefer-await-to-callbacks': 0
+      'promise/prefer-await-to-callbacks': 0,
+
+      // A strong basis of this library is being able to reference `this`
+      'unicorn/no-this-outside-of-class': 0
     }
   },
   {
@@ -33,5 +38,16 @@ export default [
       'no-undef': 'off',
       'sonarjs/no-global-this': 'off'
     }
+  },
+  {
+    files: ['test/**/*.js', 'test.js'],
+    rules: {
+      'unicorn/prefer-https': 0, // Old namespaces
+      // Too many are JSON properties called "children"
+      'unicorn/better-dom-traversing': 0,
+      'mocha/handle-done-callback': 0, // Buggy?
+      'mocha/no-done-twice': 0,
+      'mocha/no-code-after-done': 0 // Buggy
+    }
   }
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jtlt",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "type": "module",
   "author": "Brett Zamir",
   "contributors": [],
@@ -25,39 +25,40 @@
     "url": "https://github.com/brettz9/jtlt.git"
   },
   "dependencies": {
-    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lang-json": "^6.0.2",
     "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/language": "^6.11.3",
-    "@codemirror/state": "^6.5.2",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/state": "^6.7.1",
     "@lezer/highlight": "^1.2.3",
     "codemirror": "^6.0.2",
-    "fontoxpath": "^3.33.2",
-    "jamilih": "0.62.1",
-    "jhtml": "0.7.1",
-    "jsdom": "27.1.0",
-    "jsonpath-plus": "10.3.0",
+    "fontoxpath": "^3.34.0",
+    "jamilih": "0.69.0",
+    "jhtml": "0.7.3",
+    "jsdom": "30.0.1",
+    "jsonpath-plus": "10.4.0",
     "prsc": "^4.0.0",
-    "simple-get-json": "10.0.0",
+    "simple-get-json": "11.0.1",
     "whynot": "^5.0.0",
     "xpath2.js": "1.0.0-alpha-6",
     "xspattern": "^3.1.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.18.2",
-    "@node-static/node-static": "^0.8.1",
+    "@arethetypeswrong/cli": "^0.18.5",
+    "@node-static/node-static": "^0.9.1",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@types/chai": "^5.2.3",
-    "@types/jsdom": "^27.0.0",
+    "@types/jsdom": "^30.0.0",
     "@types/mocha": "^10.0.10",
-    "c8": "^10.1.3",
-    "chai": "^6.2.0",
-    "eslint": "^9.39.1",
-    "eslint-config-ash-nazg": "^39.8.0",
-    "mocha": "^11.7.5",
-    "open": "^10.2.0",
-    "rollup": "^4.53.2",
-    "typescript": "^5.9.3"
+    "baseline-browser-mapping": "^2.11.19",
+    "c8": "^12.0.0",
+    "chai": "^6.2.2",
+    "eslint": "^10.9.1",
+    "eslint-config-ash-nazg": "^42.6.0",
+    "mocha": "^11.8.0",
+    "open": "^11.0.1",
+    "rollup": "^4.63.0",
+    "typescript": "^7.0.2"
   },
   "bugs": "https://github.com/brettz9/jtlt/issues",
   "description": "Uses an approach similar to [XSLT](https://www.w3.org/Style/XSL/) for declarative, linear declaration of templates, but with JSON or JavaScript object data sources. As with XSLT, can be transformed into different formats (e.g., HTML strings, JSON, DOM objects, etc.).",
@@ -69,7 +70,7 @@
   ],
   "scripts": {
     "start": "open http://localhost:8021/demo/ && static -p 8021",
-    "attw": "attw --pack",
+    "attw": "attw --pack . --profile esm-only",
     "tsc": "tsc",
     "build": "tsc -p tsconfig-prod.json && npm run rollup",
     "rollup": "rollup -c",

package/pnpm-workspace.yaml

@@ -1,4 +1,32 @@
-onlyBuiltDependencies:
-  - ejs
-  - is-hidden-file
-  - unrs-resolver
+allowBuilds:
+  is-hidden-file: true
+  libxmljs: true
+  unrs-resolver: true
+minimumReleaseAgeExclude:
+  - '@rollup/rollup-android-arm-eabi@4.63.0'
+  - '@rollup/rollup-android-arm64@4.63.0'
+  - '@rollup/rollup-darwin-arm64@4.63.0'
+  - '@rollup/rollup-darwin-x64@4.63.0'
+  - '@rollup/rollup-freebsd-arm64@4.63.0'
+  - '@rollup/rollup-freebsd-x64@4.63.0'
+  - '@rollup/rollup-linux-arm-gnueabihf@4.63.0'
+  - '@rollup/rollup-linux-arm-musleabihf@4.63.0'
+  - '@rollup/rollup-linux-arm64-gnu@4.63.0'
+  - '@rollup/rollup-linux-arm64-musl@4.63.0'
+  - '@rollup/rollup-linux-loong64-gnu@4.63.0'
+  - '@rollup/rollup-linux-loong64-musl@4.63.0'
+  - '@rollup/rollup-linux-ppc64-gnu@4.63.0'
+  - '@rollup/rollup-linux-ppc64-musl@4.63.0'
+  - '@rollup/rollup-linux-riscv64-gnu@4.63.0'
+  - '@rollup/rollup-linux-riscv64-musl@4.63.0'
+  - '@rollup/rollup-linux-s390x-gnu@4.63.0'
+  - '@rollup/rollup-linux-x64-gnu@4.63.0'
+  - '@rollup/rollup-linux-x64-musl@4.63.0'
+  - '@rollup/rollup-openbsd-x64@4.63.0'
+  - '@rollup/rollup-openharmony-arm64@4.63.0'
+  - '@rollup/rollup-win32-arm64-msvc@4.63.0'
+  - '@rollup/rollup-win32-ia32-msvc@4.63.0'
+  - '@rollup/rollup-win32-x64-gnu@4.63.0'
+  - '@rollup/rollup-win32-x64-msvc@4.63.0'
+  - rollup@4.63.0
+  - jhtml@0.7.2 || 0.7.3

package/rollup.config.js

@@ -1,5 +1,46 @@
 import {nodeResolve} from '@rollup/plugin-node-resolve';
 
+// Store resolved paths for deduplication
+const resolvedCodemirror = new Map();
+
+/**
+ * @returns {import('rollup').Plugin}
+ */
+function dedupeCodemirror () {
+  return {
+    name: 'dedupe-codemirror',
+    /**
+     * @param {string} source
+     * @param {string|undefined} importer
+     * @param {any} options
+     * @returns {Promise<string|null>|null}
+     */
+    resolveId (source, importer, options) {
+      if (source === 'codemirror' ||
+        source.startsWith('@codemirror/') ||
+        source.startsWith('@lezer/')
+      ) {
+        if (!resolvedCodemirror.has(source)) {
+          /* eslint-disable promise/prefer-await-to-then -- sync */
+          const promise = this.resolve(
+            source, importer, {skipSelf: true, ...options}
+          ).then(
+            /**
+             * @param {any} res
+             * @returns {string|null}
+             */
+            (res) => (res ? res.id : null)
+          );
+          /* eslint-enable promise/prefer-await-to-then -- sync */
+          resolvedCodemirror.set(source, promise);
+        }
+        return resolvedCodemirror.get(source);
+      }
+      return null;
+    }
+  };
+}
+
 export default {
   input: 'demo/codemirror.js',
   output: {
@@ -8,6 +49,7 @@ export default {
     banner: '// Do not edit this file; it was auto-generated'
   },
   plugins: [
+    dedupeCodemirror(),
     nodeResolve()
   ]
 };

package/src/AbstractJoiningTransformer.js

@@ -212,6 +212,8 @@ class AbstractJoiningTransformer {
     if (!name.includes(':') && !name.startsWith('Q{')) {
       throw new Error(
         `Function name "${name}" must be in a namespace ` +
+        // eslint-disable-next-line @stylistic/max-len -- Long
+        // eslint-disable-next-line unicorn/no-incorrect-template-string-interpolation -- Not an HTML template
         `(use prefix:name or Q{uri}name)`
       );
     }
@@ -406,7 +408,12 @@ class AbstractJoiningTransformer {
   _replaceCharacterMaps (str) {
     this._outputConfig?.useCharacterMaps?.forEach((name) => {
       this._characterMap[name].forEach(({character, string}) => {
-        str = str.replaceAll(character, string);
+        str = str.replaceAll(
+          character,
+          // eslint-disable-next-line @stylistic/max-len -- Long
+          // eslint-disable-next-line unicorn/no-unsafe-string-replacement -- Safe with replacement
+          string.replaceAll('$', '$$$$')
+        );
       });
     });
     return str;

package/src/DOMJoiningTransformer.js

@@ -7,6 +7,7 @@ import AbstractJoiningTransformer from './AbstractJoiningTransformer.js';
  * @returns {void}
  */
 
+/* eslint-disable @stylistic/max-len -- Long */
 /**
  * Joining transformer that accumulates into a DOM tree.
  *
@@ -15,14 +16,35 @@ import AbstractJoiningTransformer from './AbstractJoiningTransformer.js';
  * attribute(), and text()), though string/number/boolean will append text
  * nodes for convenience.
  * @extends {AbstractJoiningTransformer<"dom">}
+ * @template {import('./AbstractJoiningTransformer.js').DOMJoiningTransformerConfig} [TConfig=import('./AbstractJoiningTransformer.js').DOMJoiningTransformerConfig]
  */
 class DOMJoiningTransformer extends AbstractJoiningTransformer {
+  /* eslint-enable @stylistic/max-len -- Long */
   /**
    * @param {DocumentFragment|Element} o - Initial DOM node
    * @param {import('./AbstractJoiningTransformer.js').
    *   DOMJoiningTransformerConfig} cfg - Configuration object
    */
+
+  /* eslint-disable @stylistic/max-len -- Long */
+  /**
+   * @template {import('./AbstractJoiningTransformer.js').DOMJoiningTransformerConfig} T
+   * @param {DocumentFragment|Element|undefined} dom - DOM element or fragment
+   * @param {T} cfg - Configuration options
+   * @returns {DOMJoiningTransformer<T>}
+   */
+  static create (dom, cfg) {
+    /* eslint-enable @stylistic/max-len -- Long */
+    return new DOMJoiningTransformer(dom, cfg);
+  }
+
+  /* eslint-disable @stylistic/max-len -- Long */
+  /**
+   * @param {DocumentFragment|Element|undefined} o - DOM element or fragment
+   * @param {import('./AbstractJoiningTransformer.js').DOMJoiningTransformerConfig} cfg - Configuration options
+   */
   constructor (o, cfg) {
+    /* eslint-enable @stylistic/max-len -- Long */
     super(cfg);
     this._dom = o || cfg.document.createDocumentFragment();
     /** @type {any} */
@@ -62,13 +84,16 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
   }
 
   /**
-   * @returns {DocumentFragment|Element|XMLDocument[]}
+   * @returns {TConfig['exposeDocuments'] extends true ?
+   *   XMLDocument[] : DocumentFragment|Element}
    */
   get () {
+    /* eslint-disable @stylistic/max-len -- Long */
     if (this._cfg.exposeDocuments) {
-      return this._docs;
+      return /** @type {TConfig['exposeDocuments'] extends true ? XMLDocument[] : DocumentFragment | Element} */ (/** @type {unknown} */ (this._docs));
     }
-    return this._dom;
+    return /** @type {TConfig['exposeDocuments'] extends true ? XMLDocument[] : DocumentFragment | Element} */ (/** @type {unknown} */ (this._dom));
+    /* eslint-enable @stylistic/max-len -- Long */
   }
 
   /**
@@ -93,7 +118,8 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
 
   /**
    * @param {Record<string, unknown>} obj - Object to serialize
-   * @param {(this: DOMJoiningTransformer) => void} [cb] - Callback function.
+   * @param {((this: DOMJoiningTransformer) => void)|null} [cb] - Callback
+   *   function.
    * @param {any[]} [usePropertySets] - Property sets to use
    * @param {Record<string, unknown>} [propSets] - Additional property sets
    * @returns {DOMJoiningTransformer}
@@ -234,6 +260,7 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
    * @param {Record<string, string>} atts
    * @param {(Node|string)[]} childNodes
    * @param {(this: DOMJoiningTransformer) => void} cb
+   * @param {string[]} [useAttributeSets] - Attribute set names to apply
    * @returns {DOMJoiningTransformer}
    */
   /**
@@ -339,12 +366,10 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
         ({xmlns} = atts ?? {});
       }
 
-      const doc = /** @type {XMLDocument} */ (
-        this._cfg.document.implementation.createDocument(
-          xmlns ?? null,
-          elementName,
-          dtd
-        )
+      const doc = this._cfg.document.implementation.createDocument(
+        xmlns ?? null,
+        elementName,
+        dtd
       );
       /* c8 ignore stop */
 
@@ -381,13 +406,15 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
       // Apply attribute sets if specified
       if (useAttributeSets && useAttributeSets.length) {
         useAttributeSets.forEach((setName) => {
-          if (this._attributeSet[setName]) {
-            for (const att in this._attributeSet[setName]) {
-              if (Object.hasOwn(this._attributeSet[setName], att)) {
-                el.setAttribute(att, this._replaceCharacterMaps(
-                  this._attributeSet[setName][att]
-                ));
-              }
+          if (Object.hasOwn(this._attributeSet, setName)) {
+            // eslint-disable-next-line @stylistic/max-len -- Long
+            // eslint-disable-next-line unicorn/no-unreadable-for-of-expression -- Long
+            for (const [att, attVal] of Object.entries(
+              this._attributeSet[setName]
+            )) {
+              el.setAttribute(att, this._replaceCharacterMaps(
+                attVal
+              ));
             }
           }
         });
@@ -431,13 +458,15 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
     // Apply attribute sets if specified
     if (useAttributeSets && useAttributeSets.length) {
       useAttributeSets.forEach((setName) => {
-        if (this._attributeSet[setName]) {
-          for (const att in this._attributeSet[setName]) {
-            if (Object.hasOwn(this._attributeSet[setName], att)) {
-              el.setAttribute(att, this._replaceCharacterMaps(
-                this._attributeSet[setName][att]
-              ));
-            }
+        if (Object.hasOwn(this._attributeSet, setName)) {
+          // eslint-disable-next-line @stylistic/max-len -- Long
+          // eslint-disable-next-line unicorn/no-unreadable-for-of-expression -- Not complex
+          for (const [att, attVal] of Object.entries(
+            this._attributeSet[setName]
+          )) {
+            el.setAttribute(att, this._replaceCharacterMaps(
+              attVal
+            ));
           }
         }
       });
@@ -673,9 +702,7 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
     // or extract from the current DOM state
     const resultDoc = this._docs.length > 0
       ? /** @type {XMLDocument} */ (this._docs.at(-1))
-      : /** @type {XMLDocument} */ (
-        this._cfg.document.implementation.createDocument(null, 'root', null)
-      );
+      : this._cfg.document.implementation.createDocument(null, 'root', null);
 
     // Store with metadata, using the output config that was set during callback
     this._resultDocuments.push({
@@ -700,6 +727,8 @@ class DOMJoiningTransformer extends AbstractJoiningTransformer {
    */
   _usePropertySets (obj, psName) {
     // Merge named property set from this.propertySets into obj
+    // eslint-disable-next-line @stylistic/max-len -- Long
+    // eslint-disable-next-line unicorn/no-computed-property-existence-check -- TS
     if (this.propertySets && this.propertySets[psName]) {
       return {
         ...obj,

package/src/JSONJoiningTransformer.js

@@ -47,6 +47,7 @@ function _makeDatasetAttribute (n0) {
  * }} ElementInfo
  */
 
+/* eslint-disable @stylistic/max-len -- Long */
 /**
  * JSON-based joining transformer for building JSON/JavaScript objects.
  *
@@ -55,14 +56,27 @@ function _makeDatasetAttribute (n0) {
  * boolean/null add primitives accordingly. It does not perform HTML escaping
  * or string serialization; it builds real JS values.
  * @extends {AbstractJoiningTransformer<"json">}
+ * @template {import('./AbstractJoiningTransformer.js').JSONJoiningTransformerConfig} [TConfig=import('./AbstractJoiningTransformer.js').JSONJoiningTransformerConfig]
  */
 class JSONJoiningTransformer extends AbstractJoiningTransformer {
   /**
-   * @param {any[]|Record<string, unknown>} [o] - Initial object or array
-   * @param {import('./AbstractJoiningTransformer.js').
-   *   JSONJoiningTransformerConfig} [cfg] - Configuration object
+   * @template {import('./AbstractJoiningTransformer.js').JSONJoiningTransformerConfig} T
+   * @param {any[]|Record<string, unknown>} [o] - Initial JSON object or array
+   * @param {T} [cfg] - Configuration options
+   * @returns {JSONJoiningTransformer<T>}
+   */
+  static create (o, cfg) {
+    /* eslint-enable @stylistic/max-len -- Long */
+    return new JSONJoiningTransformer(o, cfg);
+  }
+
+  /* eslint-disable @stylistic/max-len -- Long */
+  /**
+   * @param {any[]|Record<string, unknown>} [o] - Initial JSON object or array
+   * @param {import('./AbstractJoiningTransformer.js').JSONJoiningTransformerConfig} [cfg] - Configuration options
    */
   constructor (o, cfg) {
+    /* eslint-enable @stylistic/max-len -- Long */
     super(cfg);
     /** @type {any[]|Record<string, unknown>} */
     this._obj = o || [];
@@ -119,16 +133,17 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     return this;
   }
 
+  /* eslint-disable @stylistic/max-len -- Long */
   /**
    * Gets the current object or array. If unwrapSingleResult config option is
    * enabled and the root array contains exactly one element, returns that
    * element directly (unwrapped).
-   * @returns {any[]|Record<string, unknown>|any}
+   * @returns {TConfig['exposeDocuments'] extends true ? any[] : any[]|Record<string, unknown>|any}
    */
   get () {
     // If exposeDocuments is set, return the array of documents
     if (this._cfg.exposeDocuments) {
-      return this._docs;
+      return /** @type {TConfig['exposeDocuments'] extends true ? any[] : any[]|Record<string, unknown>|any} */ (/** @type {unknown} */ (this._docs));
     }
     // Removed this._doc logic; use this._docs only
     // Unwrap single-element arrays at the root level if configured
@@ -136,7 +151,8 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
         Array.isArray(this._obj) && this._obj.length === 1) {
       return this._obj[0];
     }
-    return this._obj;
+    return /** @type {TConfig['exposeDocuments'] extends true ? any[] : any[]|Record<string, unknown>|any} */ (/** @type {unknown} */ (this._obj));
+    /* eslint-enable @stylistic/max-len -- Long */
   }
 
   /**
@@ -166,7 +182,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
 
   /* c8 ignore next 13 -- JSDoc block incorrectly counted as coverable by c8 */
   /**
-   * @param {Record<string, unknown>|ObjectCallback} [objOrCb]
+   * @param {null|Record<string, unknown>|ObjectCallback} [objOrCb]
    *   Seed object or callback.
    * @param {ObjectCallback|any[]} [cbOrUsePropertySets] Callback or sets.
    * @param {any[]|Record<string, unknown>} [usePropertySetsOrPropSets]
@@ -247,7 +263,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
 
   /**
    * Creates a new array and executes a callback in its context.
-   * @param {any[]|ArrayCallback} [arrOrCb] Seed array or callback.
+   * @param {any[]|ArrayCallback|null} [arrOrCb] Seed array or callback.
    * @param {ArrayCallback} [cb] Callback when first arg was array.
    * @returns {JSONJoiningTransformer}
    */
@@ -424,7 +440,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     if (useAttributeSets && useAttributeSets.length) {
       const mergedAtts = {};
       useAttributeSets.forEach((setName) => {
-        if (this._attributeSet[setName]) {
+        if (Object.hasOwn(this._attributeSet, setName)) {
           Object.assign(mergedAtts, this._attributeSet[setName]);
         }
       });
@@ -436,11 +452,10 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       !Array.isArray(attsObj.dataset)
     ) {
       const ds = attsObj.dataset;
-      for (const k in ds) {
-        if (Object.hasOwn(ds, k)) {
-          const dashed = k.replaceAll(camelCase, _makeDatasetAttribute);
-          attsObj['data-' + dashed] = this._replaceCharacterMaps(ds[k]);
-        }
+      for (const [k, val] of Object.entries(ds)) {
+        // eslint-disable-next-line unicorn/no-unsafe-string-replacement -- Safe
+        const dashed = k.replaceAll(camelCase, _makeDatasetAttribute);
+        attsObj['data-' + dashed] = this._replaceCharacterMaps(val);
       }
       delete attsObj.dataset;
     }
@@ -454,9 +469,9 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     }
 
     // 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]);
+    for (const [key, val] of Object.entries(attsObj)) {
+      if (typeof val === 'string') {
+        attsObj[key] = this._replaceCharacterMaps(val);
       }
     }
 
@@ -493,14 +508,16 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
     if (isRoot) {
       // todo: indent, cdataSectionElements
       const {
-        omitXmlDeclaration, doctypePublic, doctypeSystem, method
+        omitXmlDeclaration, bareDoctype, doctypePublic, doctypeSystem, method
       } = this._outputConfig ?? {};
 
-      const dtd = {$DOCTYPE: {
-        name: elementName,
-        publicId: doctypePublic ?? null, // Public ID (optional)
-        systemId: doctypeSystem ?? null // System ID (optional)
-      }};
+      const dtd = bareDoctype !== false
+        ? [{$DOCTYPE: {
+          name: elementName,
+          publicId: doctypePublic ?? null, // Public ID (optional)
+          systemId: doctypeSystem ?? null // System ID (optional)
+        }}]
+        : [];
 
       let xmlDeclaration;
       /* c8 ignore start -- third OR condition short-circuits */
@@ -520,7 +537,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       const doc = {$document: {
         ...(xmlDeclaration ? {xmlDeclaration} : {}),
         childNodes: [
-          ...(method === 'xml' || method === 'xhtml' ? [dtd] : []),
+          ...(method === 'xml' || method === 'xhtml' ? dtd : []),
           jmlEl
         ]
       }};
@@ -630,24 +647,25 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       !Array.isArray(val)
     ) {
       const datasetObj = /** @type {Record<string, unknown>} */ (val);
-      for (const k in datasetObj) {
-        if (Object.hasOwn(datasetObj, k)) {
-          const dashed = k.replaceAll(camelCase, _makeDatasetAttribute);
-          attsObj['data-' + dashed] = this._replaceCharacterMaps(
-            /** @type {string} */ (datasetObj[k])
-          );
-        }
+      for (const [k, v] of Object.entries(datasetObj)) {
+        // eslint-disable-next-line unicorn/no-unsafe-string-replacement -- Safe
+        const dashed = k.replaceAll(camelCase, _makeDatasetAttribute);
+        attsObj['data-' + dashed] = this._replaceCharacterMaps(
+          /** @type {string} */ (v)
+        );
       }
       return this;
     }
     if (name === '$a' && Array.isArray(val)) {
       val.forEach((pair) => {
-        if (Array.isArray(pair) && pair.length > 1) {
-          const attrName = String(pair[0]);
-          // Track each ordered attribute
-          this._trackAttributePrefix(attrName);
-          attsObj[attrName] = this._replaceCharacterMaps(pair[1]);
+        if (!(Array.isArray(pair) && pair.length > 1)) {
+          return;
         }
+
+        const attrName = String(pair[0]);
+        // Track each ordered attribute
+        this._trackAttributePrefix(attrName);
+        attsObj[attrName] = this._replaceCharacterMaps(pair[1]);
       });
       return this;
     }
@@ -806,7 +824,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       // We have output config but document wasn't pushed to _docs
       // Create the document wrapper manually
       const {
-        omitXmlDeclaration, doctypePublic, doctypeSystem, method
+        omitXmlDeclaration, bareDoctype, doctypePublic, doctypeSystem, method
       } = this._outputConfig;
 
       const elementData = Array.isArray(this._obj) && this._obj.length > 0
@@ -815,11 +833,13 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
 
       const elementName = Array.isArray(elementData) ? elementData[0] : 'root';
 
-      const dtd = {$DOCTYPE: {
-        name: elementName,
-        publicId: doctypePublic ?? null,
-        systemId: doctypeSystem ?? null
-      }};
+      const dtd = bareDoctype !== false
+        ? [{$DOCTYPE: {
+          name: elementName,
+          publicId: doctypePublic ?? null,
+          systemId: doctypeSystem ?? null
+        }}]
+        : [];
 
       let xmlDeclaration;
       /* c8 ignore start -- third OR condition short-circuits */
@@ -838,7 +858,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
       resultDoc = {$document: {
         ...(xmlDeclaration ? {xmlDeclaration} : {}),
         childNodes: [
-          ...(method === 'xml' || method === 'xhtml' ? [dtd] : []),
+          ...(method === 'xml' || method === 'xhtml' ? dtd : []),
           elementData
         ]
       }};
@@ -872,7 +892,7 @@ class JSONJoiningTransformer extends AbstractJoiningTransformer {
    */
   _usePropertySets (obj, psName) {
     // Merge the named property set (if present) into the provided object
-    if (this.propertySets[psName]) {
+    if (Object.hasOwn(this.propertySets, psName)) {
       return Object.assign(obj, this.propertySets[psName]);
     }
     return obj;