jtlt 0.24.0 → 0.24.2

package/src/XPathTransformerContext.js

@@ -101,7 +101,7 @@ class XPathTransformerContext {
       }
     }
   };
-  /* c8 ignore stop */
+  /* c8 ignore stop -- See above */
 
   /**
    * @param {XPathTransformerContextConfig} config
@@ -301,7 +301,7 @@ class XPathTransformerContext {
             ? globalThis.XPathResult.ANY_TYPE
             : 0
         );
-      /* c8 ignore stop */
+      /* c8 ignore stop -- See above */
       const resultObj = docTyped.evaluate(
         expr, contextNode, resolver, type, null
       );
@@ -336,14 +336,14 @@ class XPathTransformerContext {
           n = resultObj.iterateNext();
         }
         return nodes;
-        /* c8 ignore stop */
+        /* c8 ignore stop -- See above */
       }
       /* c8 ignore start -- Default fallback for unsupported XPathResult
        * types; environment-dependent and not hit under jsdom. */
       default:
         // Fallback: return original context for unsupported types
         return this._contextNode;
-      /* c8 ignore stop */
+      /* c8 ignore stop -- See above */
       }
     }
     if (version === 2) {
@@ -542,7 +542,7 @@ class XPathTransformerContext {
         } else {
           templateObj = DTR.transformScalars;
         }
-        /* c8 ignore stop */
+        /* c8 ignore stop -- See above */
       } else {
         // Sort by priority (numeric or specificity resolver)
         pathMatchedTemplates.sort((a, b) => {
@@ -632,7 +632,7 @@ class XPathTransformerContext {
           'the XPath engine; compile with compileJSONTemplate() first.'
         );
       }
-      /* c8 ignore stop */
+      /* c8 ignore stop -- See above */
       /**
        * The template may return synchronously or return a Promise (e.g. from
        * `await this.indexedDB(...)`), which is awaited unless `config.sync`.
@@ -674,7 +674,7 @@ class XPathTransformerContext {
               // @ts-expect-error -- _openTagState: StringJoiningTransformer
               joiner._openTagState = false;
             }
-            /* c8 ignore stop */
+            /* c8 ignore stop -- See above */
             joiner.append(resolvedRet);
           }
           this._contextNode = node;
@@ -1001,20 +1001,22 @@ class XPathTransformerContext {
         currentGroup.push(node);
         const endMatch = evalInContext(groupEndingWith, node);
 
-        if (endMatch) {
-          const prevParams = this._params;
-          const prevContext = this._contextNode;
-          try {
-            this._contextNode = currentGroup[0];
-            /** @type {any} */ (this)._currentGroup = currentGroup;
-            cb.call(this, null, currentGroup, this);
-          } finally {
-            this._params = prevParams;
-            this._contextNode = prevContext;
-            delete /** @type {any} */ (this)._currentGroup;
-          }
-          currentGroup = [];
+        if (!endMatch) {
+          continue;
         }
+
+        const prevParams = this._params;
+        const prevContext = this._contextNode;
+        try {
+          this._contextNode = currentGroup[0];
+          /** @type {any} */ (this)._currentGroup = currentGroup;
+          cb.call(this, null, currentGroup, this);
+        } finally {
+          this._params = prevParams;
+          this._contextNode = prevContext;
+          delete /** @type {any} */ (this)._currentGroup;
+        }
+        currentGroup = [];
       }
 
       // Process last group if not ended
@@ -1225,7 +1227,7 @@ class XPathTransformerContext {
         // Fall through to normal XPath evaluation
         // This allows fontoxpath registered functions to work natively
       }
-      /* c8 ignore stop */
+      /* c8 ignore stop -- See above */
     }
 
     // Check for format-number() function call
@@ -1293,11 +1295,11 @@ class XPathTransformerContext {
         const resResult = this._evalXPath(selectStr, true);
         const res = /** @type {Node[]} */ (resResult);
         const first = res[0];
-        /* c8 ignore start */
+        /* c8 ignore start -- Ok? */
         val = first && first.nodeType
           ? first.textContent
           : first;
-        /* c8 ignore stop */
+        /* c8 ignore stop -- See above */
       }
     } else if (!selectStr || selectStr === '.') {
       if (this._contextNode.nodeType === 3) {
@@ -1345,9 +1347,9 @@ class XPathTransformerContext {
     if (select) {
       try {
         const res = this.get(select, true);
-        nodes = Array.isArray(res) ? res : /* c8 ignore next */ [];
-      } catch { /* c8 ignore next */
-        nodes = /* c8 ignore next */ [];
+        nodes = Array.isArray(res) ? res : /* c8 ignore next -- Ok? */ [];
+      } catch { /* c8 ignore next -- Should not err? */
+        nodes = /* c8 ignore next -- Should not err? */ [];
       }
     } else {
       nodes = [this._contextNode];
@@ -1358,13 +1360,13 @@ class XPathTransformerContext {
           let deep;
           try {
             deep = /** @type {Node} */ (n.cloneNode(true));
-          } catch { /* c8 ignore start */
+          } catch { /* c8 ignore start -- Should not err? */
             deep = /** @type {Node} */ (n.cloneNode(false));
-          } /* c8 ignore stop */
+          } /* c8 ignore stop -- See above */
           this._getJoiningTransformer().append(/** @type {any} */ (deep));
-        } else { /* c8 ignore start */
+        } else { /* c8 ignore start -- Ok? */
           this._getJoiningTransformer().append(/** @type {any} */ (n));
-        } /* c8 ignore stop */
+        } /* c8 ignore stop -- See above */
       }
     } else if (select) { // Scalar path
       const scalar = this._evalXPath(select, false);
@@ -1378,7 +1380,7 @@ class XPathTransformerContext {
       ) {
         const node = /** @type {Node} */ (scalar);
         let txt = /** @type {any} */ (node.textContent);
-        if (/* c8 ignore start */
+        if (/* c8 ignore start -- Ok? */
           (txt === null || typeof txt === 'undefined') &&
           /** @type {any} */ (node).nodeType === 9 // Document
         ) {
@@ -1387,9 +1389,9 @@ class XPathTransformerContext {
             /** @type {any} */ (node)
           ).documentElement;
           txt = /** @type {any} */ (docEl && docEl.textContent) || '';
-        } /* c8 ignore stop */
+        } /* c8 ignore stop -- See above */
         this._getJoiningTransformer().append(
-          /** @type {any} */ (txt || /* c8 ignore next */ '')
+          /** @type {any} */ (txt || /* c8 ignore next -- Ok? */ '')
         );
       } else {
         this._getJoiningTransformer().append(/** @type {any} */ (scalar));
@@ -1410,12 +1412,12 @@ class XPathTransformerContext {
     if (target && typeof target === 'object' && 'nodeType' in target) {
       try {
         clone = /** @type {Node} */ (target.cloneNode(false));
-      } catch { /* c8 ignore start */
+      } catch { /* c8 ignore start -- Should not err? */
         clone = target;
-      } /* c8 ignore stop */
-    } else { /* c8 ignore start */
+      } /* c8 ignore stop -- See above */
+    } else { /* c8 ignore start -- Ok? */
       clone = target;
-    } /* c8 ignore stop */
+    } /* c8 ignore stop -- See above */
     this._getJoiningTransformer().append(/** @type {any} */ (clone));
     return this;
   }
@@ -1463,10 +1465,9 @@ class XPathTransformerContext {
     if (this._params && Object.hasOwn(this._params, name)) {
       return {has: true, value: this._params[name]};
     }
-    if (Object.hasOwn(this._runtimeParams, name)) {
-      return {has: true, value: this._runtimeParams[name]};
-    }
-    return {has: false, value: undefined};
+    return Object.hasOwn(this._runtimeParams, name)
+      ? {has: true, value: this._runtimeParams[name]}
+      : {has: false, value: undefined};
   }
 
   /**
@@ -1610,15 +1611,18 @@ class XPathTransformerContext {
           while (node) {
             positions.unshift(this._calculatePosition(count, undefined));
             node = node.parentNode;
-            if (from) {
-              const fromResult = /** @type {any} */ (
-                this._evalXPath(from, node)
-              );
-              if (fromResult && fromResult.length > 0) {
-                break;
-              }
+            if (!from) {
+              continue;
+            }
+
+            const fromResult = /** @type {any} */ (
+              this._evalXPath(from, node)
+            );
+            if (fromResult && fromResult.length > 0) {
+              break;
             }
           }
+
           value = positions.join('.');
 
           break;
@@ -1993,8 +1997,7 @@ class XPathTransformerContext {
    */
   object (objOrCb, cbOrUsePropertySets, usePropertySetsOrPropSets, propSets) {
     const jt = this._getJoiningTransformer();
-    // Union of transformers creates intersection types
-    // @ts-expect-error
+    // @ts-expect-error -- Union of transformers creates intersection types
     jt.object(objOrCb, cbOrUsePropertySets, usePropertySetsOrPropSets,
       propSets);
     return this;
@@ -2026,8 +2029,7 @@ class XPathTransformerContext {
    */
   array (arrOrCb, cb) {
     const jt = this._getJoiningTransformer();
-    // Union of transformers creates intersection types
-    // @ts-expect-error
+    // @ts-expect-error -- Union of transformers creates intersection types
     jt.array(arrOrCb, cb);
     return this;
   }
@@ -2142,7 +2144,7 @@ class XPathTransformerContext {
         `Function '${name}' must have either 'body' or 'sequence' attribute`
       );
     }
-    /* c8 ignore stop */
+    /* c8 ignore stop -- See above */
 
     // If sequence is provided, create a body function that evaluates it
     const actualBody = sequence
@@ -2170,7 +2172,8 @@ class XPathTransformerContext {
         });
 
         // Evaluate the XPath expression with bound variables
-        const version = this._config.xpathVersion /* c8 ignore next */ ?? 1;
+        // eslint-disable-next-line @stylistic/max-len -- Long
+        const version = this._config.xpathVersion /* c8 ignore next -- Ok? */ ?? 1;
         // eslint-disable-next-line sonarjs/no-floating-point-equality -- Safe
         if (version === 3.1) {
           // Use fontoxpath for XPath 3.1
@@ -2178,10 +2181,7 @@ class XPathTransformerContext {
           /** @param {string} prefix */
           const namespaceResolver = (prefix) => {
             // Map common prefixes to URN namespaces
-            if (prefix) {
-              return `urn:${prefix}`;
-            }
-            return null;
+            return prefix ? `urn:${prefix}` : null;
           };
           // // eslint-disable-next-line import/no-named-as-default-member -- OK
           const result = fontoxpath.evaluateXPath(
@@ -2259,7 +2259,7 @@ class XPathTransformerContext {
               if (!actualBody) {
                 throw new Error(`Function body not defined for ${name}`);
               }
-              /* c8 ignore stop */
+              /* c8 ignore stop -- See above */
               // For sequence functions, unwrap/wrap arrays as needed
               // For regular body functions, pass through as-is
               if (sequence) {
@@ -2274,11 +2274,10 @@ class XPathTransformerContext {
                 const result = actualBody(...unwrappedArgs);
                 // Fontoxpath expects sequences (item()*) to be arrays
                 // But scalar types (xs:integer, xs:string) should be scalars
-                if (returnsSequence && !Array.isArray(result)) {
-                  return [result];
-                }
-                return result;
-                /* c8 ignore stop */
+                return returnsSequence && !Array.isArray(result)
+                  ? [result]
+                  : result;
+                /* c8 ignore stop -- See above */
               }
               // Regular body function - pass through
               return actualBody(...args);
@@ -2290,7 +2289,7 @@ class XPathTransformerContext {
         // Ignore fontoxpath registration errors (e.g., if duplicate)
         // Function still available via invokeFunctionByArity
       }
-      /* c8 ignore stop */
+      /* c8 ignore stop -- See above */
     }
 
     return this;
@@ -2374,8 +2373,7 @@ class XPathTransformerContext {
     const jt = this._getJoiningTransformer();
     // Only StringJoiningTransformer supports the third parameter
     if (typeof avoid !== 'undefined') {
-      // Union of transformers creates intersection types
-      // @ts-expect-error
+      // @ts-expect-error -- Union of transformers creates intersection types
       jt.attribute(name, /** @type {string} */ (val), avoid);
     } else {
       jt.attribute(name, /** @type {string} */ (val));
@@ -2530,10 +2528,7 @@ class XPathTransformerContext {
     if (Array.isArray(val)) {
       return val.length > 0;
     }
-    if (val && typeof val === 'object') {
-      return true;
-    }
-    return Boolean(val);
+    return val && typeof val === 'object' ? true : Boolean(val);
   }
 
   /**
@@ -2588,16 +2583,15 @@ class XPathTransformerContext {
     if (!passes && (/[\/@*]/v).test(select)) {
       try {
         const nodes = this.get(select, true);
-        // eslint-disable-next-line unicorn/prefer-ternary -- for coverage
         if (Array.isArray(nodes)) {
           passes = nodes.length > 0;
         // Defensive for non-array nodes, but _evalXPath with asNodes=true
         // always returns arrays in both v1 and v2.
-        /* c8 ignore start */
+        /* c8 ignore start -- Ok? */
         } else {
           passes = Boolean(nodes);
         }
-        /* c8 ignore stop */
+        /* c8 ignore stop -- See above */
       } catch {
         passes = false;
       }
@@ -2623,10 +2617,9 @@ class XPathTransformerContext {
       return null;
     }
     const right = this._parseLiteral(m.groups.right.trim());
-    if (!right) {
-      return null;
-    }
-    return {left: m.groups.left, op: m.groups.op, right: right.value};
+    return !right
+      ? null
+      : {left: m.groups.left, op: m.groups.op, right: right.value};
   }
 
   /**
@@ -2657,10 +2650,7 @@ class XPathTransformerContext {
     if (str === 'null') {
       return {value: null};
     }
-    if (str === 'undefined') {
-      return {value: undefined};
-    }
-    return null;
+    return str === 'undefined' ? {value: undefined} : null;
   }
 
   /**
@@ -2673,10 +2663,9 @@ class XPathTransformerContext {
   _resolveComparand (ref) {
     const paramRef = ref.match(/^\$(?<name>[\w\-]+)$/v);
     /* c8 ignore next 3 -- `_parseComparison` only yields a `$name` left side */
-    if (!paramRef || !paramRef.groups) {
-      return undefined;
-    }
-    return this._lookupParam(paramRef.groups.name).value;
+    return !paramRef || !paramRef.groups
+      ? undefined
+      : this._lookupParam(paramRef.groups.name).value;
   }
 
   /**
@@ -2817,12 +2806,11 @@ class XPathTransformerContext {
      * @returns {string} - Captured group or empty string
      */
     const getRegexGroup = (groupNumber) => {
-      if (!currentCapturedGroups ||
+      return !currentCapturedGroups ||
           groupNumber < 0 ||
-          groupNumber >= currentCapturedGroups.length) {
-        return '';
-      }
-      return currentCapturedGroups[groupNumber] || '';
+          groupNumber >= currentCapturedGroups.length
+        ? ''
+        : currentCapturedGroups[groupNumber] || '';
     };
 
     // Save previous context to restore later

package/src/index.js

@@ -678,6 +678,7 @@ class JTLT {
             : null
       );
     this.config.templates = query
+    // eslint-disable-next-line unicorn/prefer-minimal-ternary -- TS
       ? this.config.engineType === 'xpath'
         ? /** @type {XPathTemplateObject<joiningTypes>[]} */ ([
           {name: 'root', path: '//*', template: query}

package/src/indexedDB.js

@@ -147,7 +147,7 @@ async function readAllRecords (target, range, direction, count) {
       key: cursor.key, primaryKey: cursor.primaryKey, value: cursor.value
     }), false)
   );
-  /* c8 ignore stop */
+  /* c8 ignore stop -- See above */
 }
 
 /**
@@ -229,10 +229,9 @@ export async function queryIndexedDB (dbName, storeName, options = {}) {
 
   // Forward iteration has bulk APIs. For a store query the primary key and
   // the query key are the same, so `getAllKeys` serves both.
-  if (resultType === 'value') {
-    return target.getAll(range, count);
-  }
-  return target.getAllKeys(range, count);
+  return resultType === 'value'
+    ? target.getAll(range, count)
+    : target.getAllKeys(range, count);
 }
 
 /**
@@ -502,7 +501,7 @@ export async function evaluateXPathWithIndexedDB (selectStr, contextNode) {
   } catch {
     // Ignore: only the collected request list matters from this pass.
   }
-  /* c8 ignore stop */
+  /* c8 ignore stop -- See above */
 
   // Phase 2: fetch each distinct query and cache the records.
   const fetched = new Set();

package/src/jsonTemplate.js

@@ -89,10 +89,7 @@ function classify (node) {
   if (typeof head === 'string') {
     return 'element';
   }
-  if (isPlainObject(head)) {
-    return 'operation';
-  }
-  return null;
+  return isPlainObject(head) ? 'operation' : null;
 }
 
 /**
@@ -287,22 +284,20 @@ function validateOperationHead (head) {
       return `Unrecognized operation-node key \`${keys[0]}\`.`;
     }
     const [extKey] = keys;
-    if (!isPlainObject(head[extKey])) {
-      return `\`${extKey}\` (an extension call) requires an object value, ` +
+    return !isPlainObject(head[extKey])
+      ? `\`${extKey}\` (an extension call) requires an object value, ` +
         `e.g. \`{${extKey}: {select: '$.path'}}\` — matching ` +
         '`$indexedDB`\'s own convention. Its contents are entirely up to ' +
         'the extension itself (e.g. a `select` it resolves via `this.get' +
         '(...)`, literal fields like `db`/`store`, …) — not interpreted ' +
-        'here.';
-    }
-    return null;
+        'here.'
+      : null;
   }
-  if (Object.hasOwn(head, '$text') && keys.length > 1) {
-    return '`$text` combined with any other key (e.g. `$select`) is not ' +
+  return Object.hasOwn(head, '$text') && keys.length > 1
+    ? '`$text` combined with any other key (e.g. `$select`) is not ' +
       'valid jamilih (jamilih rejects the unrecognized companion alongside ' +
-      'its own reserved `$text`); use `$jtltText` for the combined form.';
-  }
-  return null;
+      'its own reserved `$text`); use `$jtltText` for the combined form.'
+    : null;
 }
 
 /**
@@ -392,21 +387,24 @@ function validateNode (node, format, errors) {
     }
     return;
   }
-  if (Object.hasOwn(head, '$indexedDB')) {
-    // Unlike `$if`/`$forEach`, `$indexedDB`'s children are optional — a
-    // bare prefetch (binding via `$as` for later use, or discarding the
-    // rows entirely) with no immediate consumer is a legitimate leaf use.
-    const [, childNodes] = arr;
-    if (childNodes !== undefined && !Array.isArray(childNodes)) {
-      errors.push(
-        "`$indexedDB`'s children, when given, must be a node array."
-      );
-      return;
-    }
-    const idbChildren = childNodes || [];
-    for (const child of idbChildren) {
-      validateNode(child, format, errors);
-    }
+
+  if (!Object.hasOwn(head, '$indexedDB')) {
+    return;
+  }
+
+  // Unlike `$if`/`$forEach`, `$indexedDB`'s children are optional — a
+  // bare prefetch (binding via `$as` for later use, or discarding the
+  // rows entirely) with no immediate consumer is a legitimate leaf use.
+  const [, childNodes] = arr;
+  if (childNodes !== undefined && !Array.isArray(childNodes)) {
+    errors.push(
+      "`$indexedDB`'s children, when given, must be a node array."
+    );
+    return;
+  }
+  const idbChildren = childNodes || [];
+  for (const child of idbChildren) {
+    validateNode(child, format, errors);
   }
 }
 
@@ -463,26 +461,28 @@ function collectReads (node, targets, errors) {
     }
     return;
   }
-  if (Object.hasOwn(head, '$indexedDB')) {
-    const spec = /** @type {any} */ (head.$indexedDB);
-    if (
-      !isPlainObject(spec) ||
-      typeof spec.db !== 'string' || spec.db.length === 0 ||
-      typeof spec.store !== 'string' || spec.store.length === 0
-    ) {
-      errors.push(
-        '`$indexedDB` target could not be resolved statically — `db` and ' +
-        '`store` must both be non-empty string literals: ' +
-        JSON.stringify(head)
-      );
-    } else {
-      targets.push({db: spec.db, store: spec.store});
-    }
-    const [, childNodes] = arr;
-    const idbChildren = /** @type {unknown[]} */ (childNodes ?? []);
-    for (const child of idbChildren) {
-      collectReads(child, targets, errors);
-    }
+  if (!Object.hasOwn(head, '$indexedDB')) {
+    return;
+  }
+
+  const spec = /** @type {any} */ (head.$indexedDB);
+  if (
+    !isPlainObject(spec) ||
+    typeof spec.db !== 'string' || spec.db.length === 0 ||
+    typeof spec.store !== 'string' || spec.store.length === 0
+  ) {
+    errors.push(
+      '`$indexedDB` target could not be resolved statically — `db` and ' +
+      '`store` must both be non-empty string literals: ' +
+      JSON.stringify(head)
+    );
+  } else {
+    targets.push({db: spec.db, store: spec.store});
+  }
+  const [, childNodes] = arr;
+  const idbChildren = /** @type {unknown[]} */ (childNodes ?? []);
+  for (const child of idbChildren) {
+    collectReads(child, targets, errors);
   }
 }
 
@@ -512,13 +512,18 @@ export function extractReads (nodes) {
   for (const node of nodes) {
     collectReads(node, targets, errors);
   }
-  const seen = new Set();
+  /** @type {Map<string, Set<string>>} */
+  const seenStores = new Map();
   const reads = targets.filter(({db, store}) => {
-    const key = `${db}${store}`;
-    if (seen.has(key)) {
+    let stores = seenStores.get(db);
+    if (!stores) {
+      stores = new Set();
+      seenStores.set(db, stores);
+    }
+    if (stores.has(store)) {
       return false;
     }
-    seen.add(key);
+    stores.add(store);
     return true;
   });
   return {reads, errors};

package/tsconfig-prod.json

@@ -1,16 +1,10 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "lib": ["ESNext", "DOM"],
-    "skipLibCheck": true,
-    "moduleResolution": "nodenext",
-    "module": "NodeNext",
-    "allowJs": true,
-    "checkJs": true,
     "noEmit": false,
     "declaration": true,
     "declarationMap": true,
     "emitDeclarationOnly": true,
-    "strict": true,
     "target": "es2024",
     "rootDir": "src",
     "outDir": "dist"