@storm-software/linting-tools 1.133.50 → 1.133.51

package/bin/lint.js

@@ -3,7 +3,7 @@ import {
   require_clean,
   require_semver,
   require_valid
-} from "./chunk-L5FQGZ6Z.js";
+} from "./chunk-SLCU23SU.js";
 import {
   basename,
   be,
@@ -15,12 +15,12 @@ import {
   join,
   readPackageJSON,
   resolve
-} from "./chunk-NYPSIS2H.js";
-import "./chunk-RBJRPZR3.js";
-import "./chunk-REVLN7O5.js";
-import "./chunk-AFYCBDX6.js";
-import "./chunk-YDLNZUQQ.js";
-import "./chunk-47WV45TG.js";
+} from "./chunk-YNBGKRZS.js";
+import "./chunk-KXVYKBVV.js";
+import "./chunk-5GSLGMCP.js";
+import "./chunk-ZT3UHNMN.js";
+import "./chunk-3E6AM2DT.js";
+import "./chunk-NTWVGXFR.js";
 import {
   __commonJS,
   __dirname,
@@ -31,7 +31,7 @@ import {
   __require,
   __toESM,
   init_esm_shims
-} from "./chunk-TLJEC7ED.js";
+} from "./chunk-V3TBD3T6.js";
 
 // ../../node_modules/.pnpm/dotenv@16.6.1/node_modules/dotenv/package.json
 var package_exports = {};
@@ -714,9 +714,9 @@ var require_conversions = __commonJS({
       const g2 = rgb[1];
       let b = rgb[2];
       const h = convert3.rgb.hsl(rgb)[0];
-      const w2 = 1 / 255 * Math.min(r, Math.min(g2, b));
+      const w3 = 1 / 255 * Math.min(r, Math.min(g2, b));
       b = 1 - 1 / 255 * Math.max(r, Math.max(g2, b));
-      return [h, w2 * 100, b * 100];
+      return [h, w3 * 100, b * 100];
     };
     convert3.rgb.cmyk = function(rgb) {
       const r = rgb[0] / 255;
@@ -1151,7 +1151,7 @@ var require_conversions = __commonJS({
       const pure = [0, 0, 0];
       const hi = h % 1 * 6;
       const v2 = hi % 1;
-      const w2 = 1 - v2;
+      const w3 = 1 - v2;
       let mg = 0;
       switch (Math.floor(hi)) {
         case 0:
@@ -1160,7 +1160,7 @@ var require_conversions = __commonJS({
           pure[2] = 0;
           break;
         case 1:
-          pure[0] = w2;
+          pure[0] = w3;
           pure[1] = 1;
           pure[2] = 0;
           break;
@@ -1171,7 +1171,7 @@ var require_conversions = __commonJS({
           break;
         case 3:
           pure[0] = 0;
-          pure[1] = w2;
+          pure[1] = w3;
           pure[2] = 1;
           break;
         case 4:
@@ -1182,7 +1182,7 @@ var require_conversions = __commonJS({
         default:
           pure[0] = 1;
           pure[1] = 0;
-          pure[2] = w2;
+          pure[2] = w3;
       }
       mg = (1 - c) * g2;
       return [
@@ -1220,10 +1220,10 @@ var require_conversions = __commonJS({
       return [hcg[0], (v2 - c) * 100, (1 - v2) * 100];
     };
     convert3.hwb.hcg = function(hwb) {
-      const w2 = hwb[1] / 100;
+      const w3 = hwb[1] / 100;
       const b = hwb[2] / 100;
       const v2 = 1 - b;
-      const c = v2 - w2;
+      const c = v2 - w3;
       let g2 = 0;
       if (c < 1) {
         g2 = (v2 - c) / (1 - c);
@@ -211178,7 +211178,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       function getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes) {
         const variableAssignments = map4(exposedVariableDeclarations, (v2) => factory.createShorthandPropertyAssignment(v2.symbol.name));
-        const writeAssignments = map4(writes, (w2) => factory.createShorthandPropertyAssignment(w2.symbol.name));
+        const writeAssignments = map4(writes, (w3) => factory.createShorthandPropertyAssignment(w3.symbol.name));
         return variableAssignments === void 0 ? writeAssignments : writeAssignments === void 0 ? variableAssignments : variableAssignments.concat(writeAssignments);
       }
       function isReadonlyArray2(v2) {
@@ -261696,7 +261696,7 @@ var require_ms = __commonJS({
     var m2 = s * 60;
     var h = m2 * 60;
     var d2 = h * 24;
-    var w2 = d2 * 7;
+    var w3 = d2 * 7;
     var y2 = d2 * 365.25;
     module.exports = function(val, options) {
       options = options || {};
@@ -261733,7 +261733,7 @@ var require_ms = __commonJS({
         case "weeks":
         case "week":
         case "w":
-          return n * w2;
+          return n * w3;
         case "days":
         case "day":
         case "d":
@@ -263825,7 +263825,7 @@ var require_update_workspaces = __commonJS({
       if (!newWorkspaces) {
         return originalContent;
       }
-      const hasInvalidWorkspaces = () => newWorkspaces.some((w2) => !(typeof w2 === "string"));
+      const hasInvalidWorkspaces = () => newWorkspaces.some((w3) => !(typeof w3 === "string"));
       if (!newWorkspaces.length || hasInvalidWorkspaces()) {
         throw Object.assign(
           new TypeError("workspaces should be an array of strings."),
@@ -270108,8 +270108,8 @@ var require_lib22 = __commonJS({
             }
             const mapWorkspaces = __import__npmcli_mapWorkspaces;
             const workspaces = await mapWorkspaces({ cwd: p, pkg });
-            for (const w2 of workspaces.values()) {
-              if (w2 === this.localPrefix) {
+            for (const w3 of workspaces.values()) {
+              if (w3 === this.localPrefix) {
                 if (await fileExists2(this.localPrefix, ".npmrc")) {
                   log4.warn("config", `ignoring workspace config at ${this.localPrefix}/.npmrc`);
                 }
@@ -276779,12 +276779,12 @@ var require_typedarray = __commonJS({
     function packIEEE754(v2, ebits, fbits) {
       var bias = (1 << ebits - 1) - 1, s, e, f, ln, i2, bits, str2, bytes;
       function roundToEven(n) {
-        var w2 = floor(n), f2 = n - w2;
+        var w3 = floor(n), f2 = n - w3;
         if (f2 < 0.5)
-          return w2;
+          return w3;
         if (f2 > 0.5)
-          return w2 + 1;
-        return w2 % 2 ? w2 + 1 : w2;
+          return w3 + 1;
+        return w3 % 2 ? w3 + 1 : w3;
       }
       if (v2 !== v2) {
         e = (1 << ebits) - 1;
@@ -281982,7 +281982,7 @@ var require_which2 = __commonJS({
       var pathExt = info.ext;
       var pathExtExe = info.extExe;
       var found = [];
-      (function F3(i2, l) {
+      (function F2(i2, l) {
         if (i2 === l) {
           if (opt.all && found.length)
             return cb(null, found);
@@ -281998,7 +281998,7 @@ var require_which2 = __commonJS({
         }
         ;
         (function E(ii, ll) {
-          if (ii === ll) return F3(i2 + 1, l);
+          if (ii === ll) return F2(i2 + 1, l);
           var ext3 = pathExt[ii];
           isexe(p + ext3, { pathExt: pathExtExe }, function(er, is3) {
             if (!er && is3) {
@@ -283813,11 +283813,11 @@ function interpolate(target, source = {}, parse9 = (v2) => v2) {
 }
 var _normalize = (p) => p?.replace(/\\/g, "/");
 var ASYNC_LOADERS = {
-  ".yaml": () => import("./yaml-TDU5ONQQ.js").then((r) => r.parseYAML),
-  ".yml": () => import("./yaml-TDU5ONQQ.js").then((r) => r.parseYAML),
-  ".jsonc": () => import("./jsonc-6VU54LY4.js").then((r) => r.parseJSONC),
-  ".json5": () => import("./json5-QCULZZNB.js").then((r) => r.parseJSON5),
-  ".toml": () => import("./toml-UZJIHCNF.js").then((r) => r.parseTOML)
+  ".yaml": () => import("./yaml-3SS4FPLN.js").then((r) => r.parseYAML),
+  ".yml": () => import("./yaml-3SS4FPLN.js").then((r) => r.parseYAML),
+  ".jsonc": () => import("./jsonc-HKSFIUGL.js").then((r) => r.parseJSONC),
+  ".json5": () => import("./json5-YTFIE75F.js").then((r) => r.parseJSON5),
+  ".toml": () => import("./toml-Z5LTEBLA.js").then((r) => r.parseTOML)
 };
 var SUPPORTED_EXTENSIONS = [
   // with jiti
@@ -284017,8 +284017,8 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   }
   const _merger = options.merger || defu;
   if (options.giget !== false && GIGET_PREFIXES.some((prefix) => source.startsWith(prefix))) {
-    const { downloadTemplate } = await import("./dist-PJ4KGJZQ.js");
-    const { digest } = await import("./dist-BYM6J25O.js");
+    const { downloadTemplate } = await import("./dist-4NPPYNEO.js");
+    const { digest } = await import("./dist-YR43BPMG.js");
     const cloneName = source.replace(/\W+/g, "_").split("_").splice(0, 3).join("_") + "_" + digest(source).slice(0, 10).replace(/[-_]/g, "");
     let cloneDir;
     const localNodeModules = resolve(options.cwd, "node_modules");
@@ -284456,7 +284456,9 @@ var formatLogMessage = (message, options = {}, depth2 = 0) => {
   const skip3 = options.skip ?? [];
   const sort = options.sort ?? true;
   return typeof message === "undefined" || message === null ? "<empty>" : typeof message === "string" ? !message ? "<empty string>" : message : Array.isArray(message) ? `
-${message.map(
+${message.sort(
+    sort ? (a2, b) => !a2 && !b ? 0 : !a2 ? 1 : !b ? -1 : String(a2).localeCompare(String(b)) : void 0
+  ).map(
     (item, index2) => ` ${prefix}> #${index2} = ${formatLogMessage(
       item,
       { prefix: `${prefix}--`, skip: skip3, sort },
@@ -284464,12 +284466,12 @@ ${message.map(
     )}`
   ).join("\n")}` : typeof message === "object" ? `
 ${Object.keys(message).filter(
-    (key) => !skip3.map((k2) => k2.toLowerCase()).includes(typeof key === "string" ? key.toLowerCase() : key)
-  ).sort(sort ? (a2, b) => a2.localeCompare(b) : void 0).map(
+    (key) => typeof key !== "string" || !skip3.map((k2) => k2.toLowerCase().trim()).includes(key.toLowerCase().trim())
+  ).sort(
+    sort ? (a2, b) => !a2 && !b ? 0 : !a2 ? 1 : !b ? -1 : String(a2).localeCompare(String(b)) : void 0
+  ).map(
     (key) => ` ${prefix}> ${key} = ${_isFunction(message[key]) ? "<function>" : typeof message[key] === "object" ? Object.keys(message[key]).filter(
-      (key2) => !skip3.map((k2) => k2.toLowerCase()).includes(
-        typeof key2 === "string" ? key2.toLowerCase() : key2
-      )
+      (key2) => typeof key2 !== "string" || !skip3.map((k2) => k2.toLowerCase().trim()).includes(key2.toLowerCase().trim())
     ).length === 0 ? "{}" : formatLogMessage(
       message[key],
       { prefix: `${prefix}--`, skip: skip3, sort },
@@ -290442,7 +290444,7 @@ function findCompoundNode(root, word2, compoundCharacter, ignoreCasePrefix) {
   const compoundPrefix = compoundCharacter || ignoreCasePrefix;
   const possibleCompoundPrefix = ignoreCasePrefix && compoundCharacter ? ignoreCasePrefix + compoundCharacter : "";
   const nw = word2.normalize();
-  const w2 = [...nw];
+  const w3 = [...nw];
   function determineRoot(s) {
     const prefix = s.compoundPrefix;
     let r = root;
@@ -290464,7 +290466,7 @@ function findCompoundNode(root, word2, compoundCharacter, ignoreCasePrefix) {
   let node;
   while (true) {
     const s = stack[i2];
-    const h = w2[i2++];
+    const h = w3[i2++];
     const n = s.cr || s.n;
     const c = h && n?.get(h) || void 0;
     if (c && i2 < word2.length) {
@@ -290521,11 +290523,11 @@ function isEndOfWordNode(n) {
   return !!n?.eow;
 }
 function walk(root, word2) {
-  const w2 = [...word2];
+  const w3 = [...word2];
   let n = root;
   let i2 = 0;
-  while (n && i2 < w2.length) {
-    const h = w2[i2++];
+  while (n && i2 < w3.length) {
+    const h = w3[i2++];
     n = n.get(h);
   }
   return n;
@@ -290536,15 +290538,15 @@ function findLegacyCompoundNode(roots, word2, minCompoundLength) {
   const stack = [
     { n: root, usedRoots: 1, subLength: 0, isCompound: false, cr: void 0, caseMatched: true }
   ];
-  const w2 = word2;
-  const wLen = w2.length;
+  const w3 = word2;
+  const wLen = w3.length;
   let compoundUsed = false;
   let caseMatched = true;
   let i2 = 0;
   let node;
   while (true) {
     const s = stack[i2];
-    const h = w2[i2++];
+    const h = w3[i2++];
     const n = s.cr || s.n;
     const c = n?.get(h);
     if (c && i2 < wLen) {
@@ -291613,7 +291615,7 @@ function suggestionCollector(wordToMatch, options) {
   const sugs = /* @__PURE__ */ new Map();
   let maxCost = BASE_COST * Math.min(wordToMatch.length * MAX_ALLOWED_COST_SCALE, changeLimit);
   const useSeparator = compoundSeparator || (weightMap ? DEFAULT_COMPOUNDED_WORD_SEPARATOR : defaultSuggestionCollectorOptions.compoundSeparator);
-  const fnCleanWord = !useSeparator || useSeparator === compoundSeparator ? (w2) => w2 : replaceAllFactory(useSeparator, "");
+  const fnCleanWord = !useSeparator || useSeparator === compoundSeparator ? (w3) => w3 : replaceAllFactory(useSeparator, "");
   if (useSeparator && weightMap) {
     addDefToWeightMap(weightMap, { map: useSeparator, insDel: 50 });
   }
@@ -291641,7 +291643,7 @@ function suggestionCollector(wordToMatch, options) {
   function adjustCost(sug) {
     if (sug.isPreferred) return sug;
     const words = sug.word.split(regexSeparator);
-    const extraCost = words.map((w2) => wordLengthCost[w2.length] || 0).reduce((a2, b) => a2 + b, 0) + (words.length - 1) * EXTRA_WORD_COST;
+    const extraCost = words.map((w3) => wordLengthCost[w3.length] || 0).reduce((a2, b) => a2 + b, 0) + (words.length - 1) * EXTRA_WORD_COST;
     return { word: sug.word, cost: sug.cost + extraCost };
   }
   function collectSuggestion(suggestion) {
@@ -293623,8 +293625,8 @@ var FastTrieBlobBuilder = class _FastTrieBlobBuilder {
       return this._insert(word2);
     }
     const words = word2;
-    for (const w2 of words) {
-      this._insert(w2);
+    for (const w3 of words) {
+      this._insert(w3);
     }
     return this;
   }
@@ -293987,7 +293989,7 @@ var ITrieImpl = class _ITrieImpl {
     const compoundChar = this.info.compoundCharacter;
     const subNodes = pipeSync(
       n ? iteratorTrieWords(n) : [],
-      opFilterSync((w2) => w2[w2.length - 1] !== compoundChar),
+      opFilterSync((w3) => w3[w3.length - 1] !== compoundChar),
       opMapSync((suffix) => text + suffix)
     );
     return pipeSync(n && n.eow ? [text] : [], opAppendSync(subNodes));
@@ -294013,8 +294015,8 @@ var ITrieImpl = class _ITrieImpl {
     const adjWord = sep8 ? replaceAllFactory(sep8, "") : (a2) => a2;
     const optFilter = options.filter;
     const filter6 = optFilter ? (word2, cost) => {
-      const w2 = adjWord(word2);
-      return !this.isForbiddenWord(w2) && optFilter(w2, cost);
+      const w3 = adjWord(word2);
+      return !this.isForbiddenWord(w3) && optFilter(w3, cost);
     } : (word2) => !this.isForbiddenWord(adjWord(word2));
     const opts = { ...options, filter: filter6, weightMap };
     return suggestAStar(this.data, text, opts);
@@ -294257,11 +294259,11 @@ function isEndOfWordNode2(n) {
   return n?.f === FLAG_WORD;
 }
 function walk3(root, word2) {
-  const w2 = [...word2];
+  const w3 = [...word2];
   let n = root;
   let i2 = 0;
-  while (n && i2 < w2.length) {
-    const h = w2[i2++];
+  while (n && i2 < w3.length) {
+    const h = w3[i2++];
     n = n.c?.[h];
   }
   return n;
@@ -296047,8 +296049,8 @@ function createDictionaryLineParserMapper(options) {
   if (!stripCaseAndAccentsOnForbidden) {
     doNotNormalizePrefix[forbidden] = true;
   }
-  function removeDoublePrefix(w2) {
-    return w2.startsWith(ignoreCase2 + ignoreCase2) ? w2.slice(1) : w2;
+  function removeDoublePrefix(w3) {
+    return w3.startsWith(ignoreCase2 + ignoreCase2) ? w3.slice(1) : w3;
   }
   function stripKeepCasePrefixAndQuotes(word2) {
     word2 = word2.replaceAll(/"(.*?)"/g, "$1");
@@ -296918,7 +296920,7 @@ function charsetToRepMap(charset, replaceWith = "") {
   return charset.split("|").flatMap((chars) => [...expandCharacterSet(chars)]).map((char) => [char, replaceWith]);
 }
 function expandReplaceMap(repMap) {
-  return repMap.flatMap(([from, replaceWith]) => from.split("|").map((w2) => [w2, replaceWith]));
+  return repMap.flatMap(([from, replaceWith]) => from.split("|").map((w3) => [w3, replaceWith]));
 }
 function createMapperRegExp(repMap) {
   const filteredMap = repMap.filter(([match4, _2]) => !!match4);
@@ -297103,16 +297105,16 @@ var SpellingDictionaryFromTrie = class {
       return findResult;
     }
     const forms2 = wordSearchForms(mWord, this.isDictionaryCaseSensitive, ignoreCase2);
-    for (const w2 of forms2) {
-      const findResult2 = this.trie.findWord(w2, opts);
+    for (const w3 of forms2) {
+      const findResult2 = this.trie.findWord(w3, opts);
       if (findResult2.found !== false) {
         return findResult2;
       }
     }
     if (useCompounds) {
       const optsUseCompounds = { ...opts, useLegacyWordCompounds: useCompounds };
-      for (const w2 of forms2) {
-        const findResult2 = this.trie.findWord(w2, optsUseCompounds);
+      for (const w3 of forms2) {
+        const findResult2 = this.trie.findWord(w3, optsUseCompounds);
         if (findResult2.found !== false) {
           return findResult2;
         }
@@ -297153,8 +297155,8 @@ var SpellingDictionaryFromTrie = class {
     if (this.options.noSuggest)
       return;
     const _compoundMethod = suggestOptions.compoundMethod ?? (this.options.useCompounds ? CompoundWordsMethod.JOIN_WORDS : CompoundWordsMethod.NONE);
-    for (const w2 of wordSuggestForms(collector.word)) {
-      this.trie.genSuggestions(impersonateCollector(collector, w2), _compoundMethod);
+    for (const w3 of wordSuggestForms(collector.word)) {
+      this.trie.genSuggestions(impersonateCollector(collector, w3), _compoundMethod);
     }
   }
   getErrors() {
@@ -297167,19 +297169,19 @@ function createSpellingDictionaryFromTrieFile(data, name3, source, options) {
 }
 function* outerWordForms(word2, mapWord) {
   const sent = /* @__PURE__ */ new Set();
-  let w2 = word2;
-  const ww = w2;
-  yield w2;
-  sent.add(w2);
-  w2 = word2.normalize("NFC");
-  if (w2 !== ww) {
-    yield w2;
-    sent.add(w2);
-  }
-  w2 = word2.normalize("NFD");
-  if (w2 !== ww && !sent.has(w2)) {
-    yield w2;
-    sent.add(w2);
+  let w3 = word2;
+  const ww = w3;
+  yield w3;
+  sent.add(w3);
+  w3 = word2.normalize("NFC");
+  if (w3 !== ww) {
+    yield w3;
+    sent.add(w3);
+  }
+  w3 = word2.normalize("NFD");
+  if (w3 !== ww && !sent.has(w3)) {
+    yield w3;
+    sent.add(w3);
   }
   for (const f of sent) {
     for (const m2 of mapWord(f)) {
@@ -297689,7 +297691,7 @@ function createFlagWordsDictionary(wordList, name3, source) {
 }
 var regExpCleanIgnore = /^(!!)+/;
 function buildTrieDict(words, name3, source) {
-  const trie = buildITrieFromWords(pipeSync(words, opMapSync((w2) => "!" + w2), opMapSync((w2) => w2.replace(regExpCleanIgnore, ""))));
+  const trie = buildITrieFromWords(pipeSync(words, opMapSync((w3) => "!" + w3), opMapSync((w3) => w3.replace(regExpCleanIgnore, ""))));
   return new FlagWordsDictionaryTrie(trie, name3, source);
 }
 function bisect(values, predicate) {
@@ -297720,7 +297722,7 @@ var IgnoreWordsDictionary = class {
     this.name = name3;
     this.source = source;
     this.dict = new Set(words);
-    this.dictNonStrict = new Set(pipeSync(this.dict, opFilterSync((w2) => w2.startsWith("~")), opMapSync((w2) => w2.slice(1))));
+    this.dictNonStrict = new Set(pipeSync(this.dict, opFilterSync((w3) => w3.startsWith("~")), opMapSync((w3) => w3.slice(1))));
   }
   /**
    * A Forbidden word list does not "have" valid words.
@@ -297781,7 +297783,7 @@ var createCache3 = createAutoResolveWeakCache();
 function createIgnoreWordsDictionary(wordList, name3, source) {
   return createCache3.get(wordList, () => {
     const testSpecialCharacters = /[*+]/;
-    const words = [...parseDictionaryLines(wordList, { stripCaseAndAccents: true })].map((w2) => w2.normalize(NormalizeForm));
+    const words = [...parseDictionaryLines(wordList, { stripCaseAndAccents: true })].map((w3) => w3.normalize(NormalizeForm));
     const hasSpecial = words.some((word2) => testSpecialCharacters.test(word2));
     if (hasSpecial) {
       return createSpellingDictionary(words, name3, source, {
@@ -297797,8 +297799,8 @@ function createIgnoreWordsDictionary(wordList, name3, source) {
 
 // ../../node_modules/.pnpm/cspell-dictionary@8.19.4/node_modules/cspell-dictionary/dist/SpellingDictionary/SpellingDictionaryCollection.js
 init_esm_shims();
-function identityString(w2) {
-  return w2;
+function identityString(w3) {
+  return w3;
 }
 var SpellingDictionaryCollectionImpl = class {
   dictionaries;
@@ -303245,7 +303247,7 @@ var LIB;
     }
     static parse(t2, e2 = false) {
       const r2 = u4.exec(t2);
-      return r2 ? new d2(r2[2] || c, w2(r2[4] || c), w2(r2[5] || c), w2(r2[7] || c), w2(r2[9] || c), e2) : new d2(c, c, c, c, c);
+      return r2 ? new d2(r2[2] || c, w3(r2[4] || c), w3(r2[5] || c), w3(r2[7] || c), w3(r2[9] || c), e2) : new d2(c, c, c, c, c);
     }
     static file(t2) {
       let e2 = c;
@@ -303348,7 +303350,7 @@ var LIB;
     }
   }
   const A2 = /(%[0-9A-Za-z][0-9A-Za-z])+/g;
-  function w2(t2) {
+  function w3(t2) {
     return t2.match(A2) ? t2.replace(A2, ((t3) => C3(t3))) : t2;
   }
   var x = r(975);
@@ -305121,9 +305123,9 @@ var ImplCSpellConfigFile = class extends CSpellConfigFile {
   addWords(words) {
     if (this.readonly)
       throw new Error(`Config file is readonly: ${this.url.href}`);
-    const w2 = this.settings.words || [];
-    this.settings.words = w2;
-    addUniqueWordsToListAndSort(w2, words);
+    const w3 = this.settings.words || [];
+    this.settings.words = w3;
+    addUniqueWordsToListAndSort(w3, words);
     return this;
   }
 };
@@ -309736,29 +309738,29 @@ function lineValidatorFactory(sDict, options) {
         annotateIsFlagged(issue2);
         if (!isFlaggedOrMinLength(issue2))
           continue;
-        for (const w2 of checkFullWord(issue2)) {
-          mismatches.push(w2);
+        for (const w3 of checkFullWord(issue2)) {
+          mismatches.push(w3);
         }
       }
       if (!mismatches.length)
         return mismatches;
       const hexSequences = !ignoreRandomStrings ? [] : extractHexSequences(possibleWord.text, MIN_HEX_SEQUENCE_LENGTH2).filter(
         // Only consider hex sequences that are all upper case or all lower case and contain a `-` or a digit.
-        (w2) => (w2.text === w2.text.toLowerCase() || w2.text === w2.text.toUpperCase()) && /[\d-]/.test(w2.text)
-      ).map((w2) => (w2.offset += possibleWord.offset, w2));
+        (w3) => (w3.text === w3.text.toLowerCase() || w3.text === w3.text.toUpperCase()) && /[\d-]/.test(w3.text)
+      ).map((w3) => (w3.offset += possibleWord.offset, w3));
       if (hexSequences.length) {
         mismatches = filterExcludedTextOffsets(mismatches, hexSequences);
       }
       if (mismatches.length) {
         const splitResult = split(lineSegment.segment, possibleWord.offset, splitterIsValid);
-        const nonMatching = splitResult.words.filter((w2) => !w2.isFound).filter((w2) => {
-          const m2 = w2.text.match(regExUpperCaseWithTrailingCommonEnglishSuffix);
+        const nonMatching = splitResult.words.filter((w3) => !w3.isFound).filter((w3) => {
+          const m2 = w3.text.match(regExUpperCaseWithTrailingCommonEnglishSuffix);
           if (!m2)
             return true;
-          const v2 = checkWord({ ...w2, text: m2[1], line: lineSegment.line });
+          const v2 = checkWord({ ...w3, text: m2[1], line: lineSegment.line });
           return v2.isFlagged || !v2.isFound;
         });
-        const filtered = filterExcludedTextOffsets(nonMatching.map((w2) => ({ ...w2, line: lineSegment.line })).map(annotateIsFlagged), hexSequences);
+        const filtered = filterExcludedTextOffsets(nonMatching.map((w3) => ({ ...w3, line: lineSegment.line })).map(annotateIsFlagged), hexSequences);
         if (filtered.length < mismatches.length) {
           return filtered;
         }
@@ -309975,7 +309977,7 @@ function traceWord(word2, dictCollection, config2) {
   };
   const splits = split({ text: word2, offset: 0 }, 0, checkWord);
   const wfSplits = splits.words.map((s) => ({ word: s.text, found: s.isFound }));
-  const unique2 = uniqueFn((w2) => w2.word + "|" + w2.found);
+  const unique2 = uniqueFn((w3) => w3.word + "|" + w3.found);
   const wsFound = { word: word2, found: dictCollection.has(word2, opts) };
   const wordSplits = wfSplits.some((s) => s.word === word2) ? wfSplits : [wsFound, ...wfSplits];
   const traces = wordSplits.filter(unique2).map((s) => s.word).flatMap((word3) => dictCollection.dictionaries.map((dict) => ({ dict, word: word3 }))).map(({ dict, word: word3 }) => ({ dict, findResult: dict.find(word3, opts), word: word3 })).flatMap((r2) => unpackDictionaryFindResult(r2, config2));
@@ -311107,7 +311109,7 @@ function formatQuickFix(io, issue2) {
   const preferred = issue2.suggestionsEx.filter((sug) => sug.isPreferred).map((sug) => sug.wordAdjustedToMatchCase || sug.word);
   if (!preferred.length)
     return "";
-  const fixes = preferred.map((w2) => io.chalk.italic(io.chalk.yellow(w2)));
+  const fixes = preferred.map((w3) => io.chalk.italic(io.chalk.yellow(w3)));
   return `fix: (${fixes.join(", ")})`;
 }
 function substitute(text, substitutions) {
@@ -330249,22 +330251,21 @@ import { fileURLToPath as fileURLToPath26 } from "node:url";
 // ../../node_modules/.pnpm/path-scurry@2.0.2/node_modules/path-scurry/dist/esm/index.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/lru-cache@11.3.6/node_modules/lru-cache/dist/esm/node/index.min.js
+// ../../node_modules/.pnpm/lru-cache@11.4.0/node_modules/lru-cache/dist/esm/node/index.min.js
 init_esm_shims();
-import { tracingChannel as I2, channel as G } from "node:diagnostics_channel";
-var S2 = G("lru-cache:metrics");
-var W = I2("lru-cache");
+import { tracingChannel as j, channel as G } from "node:diagnostics_channel";
+var w2 = G("lru-cache:metrics");
+var W = j("lru-cache");
 var C2 = typeof performance == "object" && performance && typeof performance.now == "function" ? performance : Date;
-var D = () => S2.hasSubscribers || W.hasSubscribers;
-var U2 = /* @__PURE__ */ new Set();
+var D = () => w2.hasSubscribers || W.hasSubscribers;
+var I2 = /* @__PURE__ */ new Set();
 var L2 = typeof process == "object" && process ? process : {};
 var P2 = (u4, e, t, i2) => {
   typeof L2.emitWarning == "function" ? L2.emitWarning(u4, e, t, i2) : console.error(`[${t}] ${e}: ${u4}`);
 };
-var H = (u4) => !U2.has(u4);
-var X = Symbol("type");
-var F2 = (u4) => !!u4 && u4 === Math.floor(u4) && u4 > 0 && isFinite(u4);
-var j = (u4) => F2(u4) ? u4 <= Math.pow(2, 8) ? Uint8Array : u4 <= Math.pow(2, 16) ? Uint16Array : u4 <= Math.pow(2, 32) ? Uint32Array : u4 <= Number.MAX_SAFE_INTEGER ? O : null : null;
+var H = (u4) => !I2.has(u4);
+var T2 = (u4) => !!u4 && u4 === Math.floor(u4) && u4 > 0 && isFinite(u4);
+var U2 = (u4) => T2(u4) ? u4 <= Math.pow(2, 8) ? Uint8Array : u4 <= Math.pow(2, 16) ? Uint16Array : u4 <= Math.pow(2, 32) ? Uint32Array : u4 <= Number.MAX_SAFE_INTEGER ? O : null : null;
 var O = class extends Array {
   constructor(e) {
     super(e), this.fill(0);
@@ -330275,7 +330276,7 @@ var R2 = class u2 {
   length;
   static #o = false;
   static create(e) {
-    let t = j(e);
+    let t = U2(e);
     if (!t) return [];
     u2.#o = true;
     let i2 = new u2(e, t);
@@ -330294,12 +330295,12 @@ var R2 = class u2 {
 };
 var M = class u3 {
   #o;
-  #u;
+  #c;
   #w;
-  #x;
+  #O;
   #S;
   #M;
-  #U;
+  #I;
   #m;
   get perf() {
     return this.#m;
@@ -330324,9 +330325,9 @@ var M = class u3 {
   #s;
   #i;
   #t;
-  #a;
-  #c;
   #l;
+  #u;
+  #a;
   #h;
   #y;
   #r;
@@ -330335,12 +330336,12 @@ var M = class u3 {
   #d;
   #g;
   #T;
-  #W;
+  #U;
   #f;
-  #j;
+  #x;
   static unsafeExposeInternals(e) {
-    return { starts: e.#F, ttls: e.#d, autopurgeTimers: e.#g, sizes: e.#_, keyMap: e.#s, keyList: e.#i, valList: e.#t, next: e.#a, prev: e.#c, get head() {
-      return e.#l;
+    return { starts: e.#F, ttls: e.#d, autopurgeTimers: e.#g, sizes: e.#_, keyMap: e.#s, keyList: e.#i, valList: e.#t, next: e.#l, prev: e.#u, get head() {
+      return e.#a;
     }, get tail() {
       return e.#h;
     }, free: e.#y, isBackgroundFetch: (t) => e.#e(t), backgroundFetch: (t, i2, s, n) => e.#P(t, i2, s, n), moveToTail: (t) => e.#L(t), indexes: (t) => e.#A(t), rindexes: (t) => e.#z(t), isStale: (t) => e.#p(t) };
@@ -330349,7 +330350,7 @@ var M = class u3 {
     return this.#o;
   }
   get maxSize() {
-    return this.#u;
+    return this.#c;
   }
   get calculatedSize() {
     return this.#b;
@@ -330361,42 +330362,42 @@ var M = class u3 {
     return this.#M;
   }
   get memoMethod() {
-    return this.#U;
+    return this.#I;
   }
   get dispose() {
     return this.#w;
   }
   get onInsert() {
-    return this.#x;
+    return this.#O;
   }
   get disposeAfter() {
     return this.#S;
   }
   constructor(e) {
-    let { max: t = 0, ttl: i2, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: r, allowStale: h, dispose: l, onInsert: c, disposeAfter: f, noDisposeOnSet: g2, noUpdateTTL: p, maxSize: T2 = 0, maxEntrySize: w2 = 0, sizeCalculation: y2, fetchMethod: a2, memoMethod: m2, noDeleteOnFetchRejection: _2, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: d2, allowStaleOnFetchAbort: A2, ignoreFetchAbort: z, perf: x } = e;
+    let { max: t = 0, ttl: i2, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: r, updateAgeOnHas: h, allowStale: a2, dispose: o, onInsert: p, disposeAfter: m2, noDisposeOnSet: _2, noUpdateTTL: c, maxSize: d2 = 0, maxEntrySize: f = 0, sizeCalculation: y2, fetchMethod: l, memoMethod: S2, noDeleteOnFetchRejection: F2, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: g2, allowStaleOnFetchAbort: A2, ignoreFetchAbort: z, perf: x } = e;
     if (x !== void 0 && typeof x?.now != "function") throw new TypeError("perf option must have a now() method if specified");
-    if (this.#m = x ?? C2, t !== 0 && !F2(t)) throw new TypeError("max option must be a nonnegative integer");
-    let v2 = t ? j(t) : Array;
-    if (!v2) throw new Error("invalid max value: " + t);
-    if (this.#o = t, this.#u = T2, this.maxEntrySize = w2 || this.#u, this.sizeCalculation = y2, this.sizeCalculation) {
-      if (!this.#u && !this.maxEntrySize) throw new TypeError("cannot set sizeCalculation without setting maxSize or maxEntrySize");
+    if (this.#m = x ?? C2, t !== 0 && !T2(t)) throw new TypeError("max option must be a nonnegative integer");
+    let E = t ? U2(t) : Array;
+    if (!E) throw new Error("invalid max value: " + t);
+    if (this.#o = t, this.#c = d2, this.maxEntrySize = f || this.#c, this.sizeCalculation = y2, this.sizeCalculation) {
+      if (!this.#c && !this.maxEntrySize) throw new TypeError("cannot set sizeCalculation without setting maxSize or maxEntrySize");
       if (typeof this.sizeCalculation != "function") throw new TypeError("sizeCalculation set to non-function");
     }
-    if (m2 !== void 0 && typeof m2 != "function") throw new TypeError("memoMethod must be a function if defined");
-    if (this.#U = m2, a2 !== void 0 && typeof a2 != "function") throw new TypeError("fetchMethod must be a function if specified");
-    if (this.#M = a2, this.#W = !!a2, this.#s = /* @__PURE__ */ new Map(), this.#i = Array.from({ length: t }).fill(void 0), this.#t = Array.from({ length: t }).fill(void 0), this.#a = new v2(t), this.#c = new v2(t), this.#l = 0, this.#h = 0, this.#y = R2.create(t), this.#n = 0, this.#b = 0, typeof l == "function" && (this.#w = l), typeof c == "function" && (this.#x = c), typeof f == "function" ? (this.#S = f, this.#r = []) : (this.#S = void 0, this.#r = void 0), this.#T = !!this.#w, this.#j = !!this.#x, this.#f = !!this.#S, this.noDisposeOnSet = !!g2, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!_2, this.allowStaleOnFetchRejection = !!d2, this.allowStaleOnFetchAbort = !!A2, this.ignoreFetchAbort = !!z, this.maxEntrySize !== 0) {
-      if (this.#u !== 0 && !F2(this.#u)) throw new TypeError("maxSize must be a positive integer if specified");
-      if (!F2(this.maxEntrySize)) throw new TypeError("maxEntrySize must be a positive integer if specified");
+    if (S2 !== void 0 && typeof S2 != "function") throw new TypeError("memoMethod must be a function if defined");
+    if (this.#I = S2, l !== void 0 && typeof l != "function") throw new TypeError("fetchMethod must be a function if specified");
+    if (this.#M = l, this.#U = !!l, this.#s = /* @__PURE__ */ new Map(), this.#i = Array.from({ length: t }).fill(void 0), this.#t = Array.from({ length: t }).fill(void 0), this.#l = new E(t), this.#u = new E(t), this.#a = 0, this.#h = 0, this.#y = R2.create(t), this.#n = 0, this.#b = 0, typeof o == "function" && (this.#w = o), typeof p == "function" && (this.#O = p), typeof m2 == "function" ? (this.#S = m2, this.#r = []) : (this.#S = void 0, this.#r = void 0), this.#T = !!this.#w, this.#x = !!this.#O, this.#f = !!this.#S, this.noDisposeOnSet = !!_2, this.noUpdateTTL = !!c, this.noDeleteOnFetchRejection = !!F2, this.allowStaleOnFetchRejection = !!g2, this.allowStaleOnFetchAbort = !!A2, this.ignoreFetchAbort = !!z, this.maxEntrySize !== 0) {
+      if (this.#c !== 0 && !T2(this.#c)) throw new TypeError("maxSize must be a positive integer if specified");
+      if (!T2(this.maxEntrySize)) throw new TypeError("maxEntrySize must be a positive integer if specified");
       this.#X();
     }
-    if (this.allowStale = !!h, this.noDeleteOnStaleGet = !!b, this.updateAgeOnGet = !!o, this.updateAgeOnHas = !!r, this.ttlResolution = F2(s) || s === 0 ? s : 1, this.ttlAutopurge = !!n, this.ttl = i2 || 0, this.ttl) {
-      if (!F2(this.ttl)) throw new TypeError("ttl must be a positive integer if specified");
+    if (this.allowStale = !!a2, this.noDeleteOnStaleGet = !!b, this.updateAgeOnGet = !!r, this.updateAgeOnHas = !!h, this.ttlResolution = T2(s) || s === 0 ? s : 1, this.ttlAutopurge = !!n, this.ttl = i2 || 0, this.ttl) {
+      if (!T2(this.ttl)) throw new TypeError("ttl must be a positive integer if specified");
       this.#H();
     }
-    if (this.#o === 0 && this.ttl === 0 && this.#u === 0) throw new TypeError("At least one of max, maxSize, or ttl is required");
-    if (!this.ttlAutopurge && !this.#o && !this.#u) {
-      let E = "LRU_CACHE_UNBOUNDED";
-      H(E) && (U2.add(E), P2("TTL caching without ttlAutopurge, max, or maxSize can result in unbounded memory consumption.", "UnboundedCacheWarning", E, u3));
+    if (this.#o === 0 && this.ttl === 0 && this.#c === 0) throw new TypeError("At least one of max, maxSize, or ttl is required");
+    if (!this.ttlAutopurge && !this.#o && !this.#c) {
+      let v2 = "LRU_CACHE_UNBOUNDED";
+      H(v2) && (I2.add(v2), P2("TTL caching without ttlAutopurge, max, or maxSize can result in unbounded memory consumption.", "UnboundedCacheWarning", v2, u3));
     }
   }
   getRemainingTTL(e) {
@@ -330406,53 +330407,53 @@ var M = class u3 {
     let e = new O(this.#o), t = new O(this.#o);
     this.#d = e, this.#F = t;
     let i2 = this.ttlAutopurge ? Array.from({ length: this.#o }) : void 0;
-    this.#g = i2, this.#N = (r, h, l = this.#m.now()) => {
-      t[r] = h !== 0 ? l : 0, e[r] = h, s(r, h);
-    }, this.#D = (r) => {
-      t[r] = e[r] !== 0 ? this.#m.now() : 0, s(r, e[r]);
-    };
-    let s = this.ttlAutopurge ? (r, h) => {
-      if (i2?.[r] && (clearTimeout(i2[r]), i2[r] = void 0), h && h !== 0 && i2) {
-        let l = setTimeout(() => {
-          this.#p(r) && this.#v(this.#i[r], "expire");
-        }, h + 1);
-        l.unref && l.unref(), i2[r] = l;
+    this.#g = i2, this.#N = (h, a2, o = this.#m.now()) => {
+      t[h] = a2 !== 0 ? o : 0, e[h] = a2, s(h, a2);
+    }, this.#D = (h) => {
+      t[h] = e[h] !== 0 ? this.#m.now() : 0, s(h, e[h]);
+    };
+    let s = this.ttlAutopurge ? (h, a2) => {
+      if (i2?.[h] && (clearTimeout(i2[h]), i2[h] = void 0), a2 && a2 !== 0 && i2) {
+        let o = setTimeout(() => {
+          this.#p(h) && this.#E(this.#i[h], "expire");
+        }, a2 + 1);
+        o.unref && o.unref(), i2[h] = o;
       }
     } : () => {
     };
-    this.#E = (r, h) => {
-      if (e[h]) {
-        let l = e[h], c = t[h];
-        if (!l || !c) return;
-        r.ttl = l, r.start = c, r.now = n || o();
-        let f = r.now - c;
-        r.remainingTTL = l - f;
+    this.#v = (h, a2) => {
+      if (e[a2]) {
+        let o = e[a2], p = t[a2];
+        if (!o || !p) return;
+        h.ttl = o, h.start = p, h.now = n || r();
+        let m2 = h.now - p;
+        h.remainingTTL = o - m2;
       }
     };
-    let n = 0, o = () => {
-      let r = this.#m.now();
+    let n = 0, r = () => {
+      let h = this.#m.now();
       if (this.ttlResolution > 0) {
-        n = r;
-        let h = setTimeout(() => n = 0, this.ttlResolution);
-        h.unref && h.unref();
+        n = h;
+        let a2 = setTimeout(() => n = 0, this.ttlResolution);
+        a2.unref && a2.unref();
       }
-      return r;
+      return h;
     };
-    this.getRemainingTTL = (r) => {
-      let h = this.#s.get(r);
-      if (h === void 0) return 0;
-      let l = e[h], c = t[h];
-      if (!l || !c) return 1 / 0;
-      let f = (n || o()) - c;
-      return l - f;
-    }, this.#p = (r) => {
-      let h = t[r], l = e[r];
-      return !!l && !!h && (n || o()) - h > l;
+    this.getRemainingTTL = (h) => {
+      let a2 = this.#s.get(h);
+      if (a2 === void 0) return 0;
+      let o = e[a2], p = t[a2];
+      if (!o || !p) return 1 / 0;
+      let m2 = (n || r()) - p;
+      return o - m2;
+    }, this.#p = (h) => {
+      let a2 = t[h], o = e[h];
+      return !!o && !!a2 && (n || r()) - a2 > o;
     };
   }
   #D = () => {
   };
-  #E = () => {
+  #v = () => {
   };
   #N = () => {
   };
@@ -330461,16 +330462,16 @@ var M = class u3 {
     let e = new O(this.#o);
     this.#b = 0, this.#_ = e, this.#R = (t) => {
       this.#b -= e[t], e[t] = 0;
-    }, this.#k = (t, i2, s, n) => {
+    }, this.#V = (t, i2, s, n) => {
       if (this.#e(i2)) return 0;
-      if (!F2(s)) if (n) {
+      if (!T2(s)) if (n) {
         if (typeof n != "function") throw new TypeError("sizeCalculation must be a function");
-        if (s = n(i2, t), !F2(s)) throw new TypeError("sizeCalculation return invalid (expect positive integer)");
+        if (s = n(i2, t), !T2(s)) throw new TypeError("sizeCalculation return invalid (expect positive integer)");
       } else throw new TypeError("invalid size value (must be positive integer). When maxSize or maxEntrySize is used, sizeCalculation or size must be set.");
       return s;
-    }, this.#I = (t, i2, s) => {
-      if (e[t] = i2, this.#u) {
-        let n = this.#u - e[t];
+    }, this.#j = (t, i2, s) => {
+      if (e[t] = i2, this.#c) {
+        let n = this.#c - e[t];
         for (; this.#b > n; ) this.#G(true);
       }
       this.#b += e[t], s && (s.entrySize = i2, s.totalCalculatedSize = this.#b);
@@ -330478,19 +330479,19 @@ var M = class u3 {
   }
   #R = (e) => {
   };
-  #I = (e, t, i2) => {
+  #j = (e, t, i2) => {
   };
-  #k = (e, t, i2, s) => {
+  #V = (e, t, i2, s) => {
     if (i2 || s) throw new TypeError("cannot set size without setting maxSize or maxEntrySize on cache");
     return 0;
   };
   *#A({ allowStale: e = this.allowStale } = {}) {
-    if (this.#n) for (let t = this.#h; this.#V(t) && ((e || !this.#p(t)) && (yield t), t !== this.#l); ) t = this.#c[t];
+    if (this.#n) for (let t = this.#h; this.#B(t) && ((e || !this.#p(t)) && (yield t), t !== this.#a); ) t = this.#u[t];
   }
   *#z({ allowStale: e = this.allowStale } = {}) {
-    if (this.#n) for (let t = this.#l; this.#V(t) && ((e || !this.#p(t)) && (yield t), t !== this.#h); ) t = this.#a[t];
+    if (this.#n) for (let t = this.#a; this.#B(t) && ((e || !this.#p(t)) && (yield t), t !== this.#h); ) t = this.#l[t];
   }
-  #V(e) {
+  #B(e) {
     return e !== void 0 && this.#s.get(this.#i[e]) === e;
   }
   *entries() {
@@ -330541,7 +330542,7 @@ var M = class u3 {
   }
   purgeStale() {
     let e = false;
-    for (let t of this.#z({ allowStale: true })) this.#p(t) && (this.#v(this.#i[t], "expire"), e = true);
+    for (let t of this.#z({ allowStale: true })) this.#p(t) && (this.#E(this.#i[t], "expire"), e = true);
     return e;
   }
   info(e) {
@@ -330551,10 +330552,10 @@ var M = class u3 {
     if (s === void 0) return;
     let n = { value: s };
     if (this.#d && this.#F) {
-      let o = this.#d[t], r = this.#F[t];
-      if (o && r) {
-        let h = o - (this.#m.now() - r);
-        n.ttl = h, n.start = Date.now();
+      let r = this.#d[t], h = this.#F[t];
+      if (r && h) {
+        let a2 = r - (this.#m.now() - h);
+        n.ttl = a2, n.start = Date.now();
       }
     }
     return this.#_ && (n.size = this.#_[t]), n;
@@ -330564,13 +330565,13 @@ var M = class u3 {
     for (let t of this.#A({ allowStale: true })) {
       let i2 = this.#i[t], s = this.#t[t], n = this.#e(s) ? s.__staleWhileFetching : s;
       if (n === void 0 || i2 === void 0) continue;
-      let o = { value: n };
+      let r = { value: n };
       if (this.#d && this.#F) {
-        o.ttl = this.#d[t];
-        let r = this.#m.now() - this.#F[t];
-        o.start = Math.floor(Date.now() - r);
+        r.ttl = this.#d[t];
+        let h = this.#m.now() - this.#F[t];
+        r.start = Math.floor(Date.now() - h);
       }
-      this.#_ && (o.size = this.#_[t]), e.unshift([i2, o]);
+      this.#_ && (r.size = this.#_[t]), e.unshift([i2, r]);
     }
     return e;
   }
@@ -330581,51 +330582,49 @@ var M = class u3 {
         let s = Date.now() - i2.start;
         i2.start = this.#m.now() - s;
       }
-      this.#O(t, i2.value, i2);
+      this.#W(t, i2.value, i2);
     }
   }
   set(e, t, i2 = {}) {
-    let { status: s = S2.hasSubscribers ? {} : void 0 } = i2;
-    i2.status = s, s && (s.op = "set", s.key = e, t !== void 0 && (s.value = t));
-    let n = this.#O(e, t, i2);
-    return s && S2.hasSubscribers && S2.publish(s), n;
-  }
-  #O(e, t, i2 = {}) {
-    let { ttl: s = this.ttl, start: n, noDisposeOnSet: o = this.noDisposeOnSet, sizeCalculation: r = this.sizeCalculation, status: h } = i2;
-    if (t === void 0) return h && (h.set = "deleted"), this.delete(e), this;
-    let { noUpdateTTL: l = this.noUpdateTTL } = i2;
-    h && !this.#e(t) && (h.value = t);
-    let c = this.#k(e, t, i2.size || 0, r, h);
-    if (this.maxEntrySize && c > this.maxEntrySize) return this.#v(e, "set"), h && (h.set = "miss", h.maxEntrySizeExceeded = true), this;
-    let f = this.#n === 0 ? void 0 : this.#s.get(e);
-    if (f === void 0) f = this.#n === 0 ? this.#h : this.#y.length !== 0 ? this.#y.pop() : this.#n === this.#o ? this.#G(false) : this.#n, this.#i[f] = e, this.#t[f] = t, this.#s.set(e, f), this.#a[this.#h] = f, this.#c[f] = this.#h, this.#h = f, this.#n++, this.#I(f, c, h), h && (h.set = "add"), l = false, this.#j && this.#x?.(t, e, "add");
+    let { status: s = w2.hasSubscribers ? {} : void 0 } = i2;
+    i2.status = s, s && (s.op = "set", s.key = e, t !== void 0 && (s.value = t), s.cache = this);
+    let n = this.#W(e, t, i2);
+    return s && w2.hasSubscribers && w2.publish(s), n;
+  }
+  #W(e, t, i2, s) {
+    let { ttl: n = this.ttl, start: r, noDisposeOnSet: h = this.noDisposeOnSet, sizeCalculation: a2 = this.sizeCalculation, status: o } = i2;
+    if (t === void 0) return o && (o.set = "deleted"), this.delete(e), this;
+    let { noUpdateTTL: p = this.noUpdateTTL } = i2, m2 = this.#e(t);
+    o && !m2 && (o.value = t);
+    let _2 = this.#V(e, t, i2.size || 0, a2, o);
+    if (this.maxEntrySize && _2 > this.maxEntrySize) return this.#E(e, "set"), o && (o.set = "miss", o.maxEntrySizeExceeded = true), this;
+    let c = this.#n === 0 ? void 0 : this.#s.get(e);
+    if (c === void 0) c = this.#n === 0 ? this.#h : this.#y.length !== 0 ? this.#y.pop() : this.#n === this.#o ? this.#G(false) : this.#n, this.#i[c] = e, this.#t[c] = t, this.#s.set(e, c), this.#l[this.#h] = c, this.#u[c] = this.#h, this.#h = c, this.#n++, this.#j(c, _2, o), o && (o.set = "add"), p = false, this.#x && !m2 && this.#O?.(t, e, "add");
     else {
-      this.#L(f);
-      let g2 = this.#t[f];
-      if (t !== g2) {
-        if (this.#W && this.#e(g2)) {
-          g2.__abortController.abort(new Error("replaced"));
-          let { __staleWhileFetching: p } = g2;
-          p !== void 0 && !o && (this.#T && this.#w?.(p, e, "set"), this.#f && this.#r?.push([p, e, "set"]));
-        } else o || (this.#T && this.#w?.(g2, e, "set"), this.#f && this.#r?.push([g2, e, "set"]));
-        if (this.#R(f), this.#I(f, c, h), this.#t[f] = t, h) {
-          h.set = "replace";
-          let p = g2 && this.#e(g2) ? g2.__staleWhileFetching : g2;
-          p !== void 0 && (h.oldValue = p);
-        }
-      } else h && (h.set = "update");
-      this.#j && this.onInsert?.(t, e, t === g2 ? "update" : "replace");
-    }
-    if (s !== 0 && !this.#d && this.#H(), this.#d && (l || this.#N(f, s, n), h && this.#E(h, f)), !o && this.#f && this.#r) {
-      let g2 = this.#r, p;
-      for (; p = g2?.shift(); ) this.#S?.(...p);
+      this.#L(c);
+      let d2 = this.#t[c];
+      if (t !== d2) {
+        if (!h) if (this.#e(d2)) {
+          d2 !== s && d2.__abortController.abort(new Error("replaced"));
+          let { __staleWhileFetching: f } = d2;
+          f !== void 0 && f !== t && (this.#T && this.#w?.(f, e, "set"), this.#f && this.#r?.push([f, e, "set"]));
+        } else this.#T && this.#w?.(d2, e, "set"), this.#f && this.#r?.push([d2, e, "set"]);
+        if (this.#R(c), this.#j(c, _2, o), this.#t[c] = t, !m2) {
+          let f = d2 && this.#e(d2) ? d2.__staleWhileFetching : d2, y2 = f === void 0 ? "add" : t !== f ? "replace" : "update";
+          o && (o.set = y2, f !== void 0 && (o.oldValue = f)), this.#x && this.onInsert?.(t, e, y2);
+        }
+      } else m2 || (o && (o.set = "update"), this.#x && this.onInsert?.(t, e, "update"));
+    }
+    if (n !== 0 && !this.#d && this.#H(), this.#d && (p || this.#N(c, n, r), o && this.#v(o, c)), !h && this.#f && this.#r) {
+      let d2 = this.#r, f;
+      for (; f = d2?.shift(); ) this.#S?.(...f);
     }
     return this;
   }
   pop() {
     try {
       for (; this.#n; ) {
-        let e = this.#t[this.#l];
+        let e = this.#t[this.#a];
         if (this.#G(true), this.#e(e)) {
           if (e.__staleWhileFetching) return e.__staleWhileFetching;
         } else if (e !== void 0) return e;
@@ -330638,30 +330637,32 @@ var M = class u3 {
     }
   }
   #G(e) {
-    let t = this.#l, i2 = this.#i[t], s = this.#t[t];
-    return this.#W && this.#e(s) ? s.__abortController.abort(new Error("evicted")) : (this.#T || this.#f) && (this.#T && this.#w?.(s, i2, "evict"), this.#f && this.#r?.push([s, i2, "evict"])), this.#R(t), this.#g?.[t] && (clearTimeout(this.#g[t]), this.#g[t] = void 0), e && (this.#i[t] = void 0, this.#t[t] = void 0, this.#y.push(t)), this.#n === 1 ? (this.#l = this.#h = 0, this.#y.length = 0) : this.#l = this.#a[t], this.#s.delete(i2), this.#n--, t;
+    let t = this.#a, i2 = this.#i[t], s = this.#t[t], n = this.#e(s);
+    n && s.__abortController.abort(new Error("evicted"));
+    let r = n ? s.__staleWhileFetching : s;
+    return (this.#T || this.#f) && r !== void 0 && (this.#T && this.#w?.(r, i2, "evict"), this.#f && this.#r?.push([r, i2, "evict"])), this.#R(t), this.#g?.[t] && (clearTimeout(this.#g[t]), this.#g[t] = void 0), e && (this.#i[t] = void 0, this.#t[t] = void 0, this.#y.push(t)), this.#n === 1 ? (this.#a = this.#h = 0, this.#y.length = 0) : this.#a = this.#l[t], this.#s.delete(i2), this.#n--, t;
   }
   has(e, t = {}) {
-    let { status: i2 = S2.hasSubscribers ? {} : void 0 } = t;
-    t.status = i2, i2 && (i2.op = "has", i2.key = e);
+    let { status: i2 = w2.hasSubscribers ? {} : void 0 } = t;
+    t.status = i2, i2 && (i2.op = "has", i2.key = e, i2.cache = this);
     let s = this.#Y(e, t);
-    return S2.hasSubscribers && S2.publish(i2), s;
+    return w2.hasSubscribers && w2.publish(i2), s;
   }
   #Y(e, t = {}) {
     let { updateAgeOnHas: i2 = this.updateAgeOnHas, status: s } = t, n = this.#s.get(e);
     if (n !== void 0) {
-      let o = this.#t[n];
-      if (this.#e(o) && o.__staleWhileFetching === void 0) return false;
-      if (this.#p(n)) s && (s.has = "stale", this.#E(s, n));
-      else return i2 && this.#D(n), s && (s.has = "hit", this.#E(s, n)), true;
+      let r = this.#t[n];
+      if (this.#e(r) && r.__staleWhileFetching === void 0) return false;
+      if (this.#p(n)) s && (s.has = "stale", this.#v(s, n));
+      else return i2 && this.#D(n), s && (s.has = "hit", this.#v(s, n)), true;
     } else s && (s.has = "miss");
     return false;
   }
   peek(e, t = {}) {
     let { status: i2 = D() ? {} : void 0 } = t;
-    i2 && (i2.op = "peek", i2.key = e), t.status = i2;
+    i2 && (i2.op = "peek", i2.key = e, i2.cache = this), t.status = i2;
     let s = this.#J(e, t);
-    return S2.hasSubscribers && S2.publish(i2), s;
+    return w2.hasSubscribers && w2.publish(i2), s;
   }
   #J(e, t) {
     let { status: i2, allowStale: s = this.allowStale } = t, n = this.#s.get(e);
@@ -330669,63 +330670,63 @@ var M = class u3 {
       i2 && (i2.peek = n === void 0 ? "miss" : "stale");
       return;
     }
-    let o = this.#t[n], r = this.#e(o) ? o.__staleWhileFetching : o;
-    return i2 && (r !== void 0 ? (i2.peek = "hit", i2.value = r) : i2.peek = "miss"), r;
+    let r = this.#t[n], h = this.#e(r) ? r.__staleWhileFetching : r;
+    return i2 && (h !== void 0 ? (i2.peek = "hit", i2.value = h) : i2.peek = "miss"), h;
   }
   #P(e, t, i2, s) {
     let n = t === void 0 ? void 0 : this.#t[t];
     if (this.#e(n)) return n;
-    let o = new AbortController(), { signal: r } = i2;
-    r?.addEventListener("abort", () => o.abort(r.reason), { signal: o.signal });
-    let h = { signal: o.signal, options: i2, context: s }, l = (w2, y2 = false) => {
-      let { aborted: a2 } = o.signal, m2 = i2.ignoreFetchAbort && w2 !== void 0, _2 = i2.ignoreFetchAbort || !!(i2.allowStaleOnFetchAbort && w2 !== void 0);
-      if (i2.status && (a2 && !y2 ? (i2.status.fetchAborted = true, i2.status.fetchError = o.signal.reason, m2 && (i2.status.fetchAbortIgnored = true)) : i2.status.fetchResolved = true), a2 && !m2 && !y2) return f(o.signal.reason, _2);
-      let b = p, d2 = this.#t[t];
-      return (d2 === p || d2 === void 0 && m2 && y2) && (w2 === void 0 ? b.__staleWhileFetching !== void 0 ? this.#t[t] = b.__staleWhileFetching : this.#v(e, "fetch") : (i2.status && (i2.status.fetchUpdated = true), this.#O(e, w2, h.options))), w2;
-    }, c = (w2) => (i2.status && (i2.status.fetchRejected = true, i2.status.fetchError = w2), f(w2, false)), f = (w2, y2) => {
-      let { aborted: a2 } = o.signal, m2 = a2 && i2.allowStaleOnFetchAbort, _2 = m2 || i2.allowStaleOnFetchRejection, b = _2 || i2.noDeleteOnFetchRejection, d2 = p;
-      if (this.#t[t] === p && (!b || !y2 && d2.__staleWhileFetching === void 0 ? this.#v(e, "fetch") : m2 || (this.#t[t] = d2.__staleWhileFetching)), _2) return i2.status && d2.__staleWhileFetching !== void 0 && (i2.status.returnedStale = true), d2.__staleWhileFetching;
-      if (d2.__returned === d2) throw w2;
-    }, g2 = (w2, y2) => {
-      let a2 = this.#M?.(e, n, h);
-      a2 && a2 instanceof Promise && a2.then((m2) => w2(m2 === void 0 ? void 0 : m2), y2), o.signal.addEventListener("abort", () => {
-        (!i2.ignoreFetchAbort || i2.allowStaleOnFetchAbort) && (w2(void 0), i2.allowStaleOnFetchAbort && (w2 = (m2) => l(m2, true)));
-      });
+    let r = new AbortController(), { signal: h } = i2;
+    h?.addEventListener("abort", () => r.abort(h.reason), { signal: r.signal });
+    let a2 = { signal: r.signal, options: i2, context: s }, o = (f, y2 = false) => {
+      let { aborted: l } = r.signal, S2 = i2.ignoreFetchAbort && f !== void 0, F2 = i2.ignoreFetchAbort || !!(i2.allowStaleOnFetchAbort && f !== void 0);
+      if (i2.status && (l && !y2 ? (i2.status.fetchAborted = true, i2.status.fetchError = r.signal.reason, S2 && (i2.status.fetchAbortIgnored = true)) : i2.status.fetchResolved = true), l && !S2 && !y2) return m2(r.signal.reason, F2);
+      let b = c, g2 = this.#t[t];
+      return (g2 === c || g2 === void 0 && S2 && y2) && (f === void 0 ? b.__staleWhileFetching !== void 0 ? this.#t[t] = b.__staleWhileFetching : this.#E(e, "fetch") : (i2.status && (i2.status.fetchUpdated = true), this.#W(e, f, a2.options, b))), f;
+    }, p = (f) => (i2.status && (i2.status.fetchRejected = true, i2.status.fetchError = f), m2(f, false)), m2 = (f, y2) => {
+      let { aborted: l } = r.signal, S2 = l && i2.allowStaleOnFetchAbort, F2 = S2 || i2.allowStaleOnFetchRejection, b = F2 || i2.noDeleteOnFetchRejection, g2 = c;
+      if (this.#t[t] === c && (!b || !y2 && g2.__staleWhileFetching === void 0 ? this.#E(e, "fetch") : S2 || (this.#t[t] = g2.__staleWhileFetching)), F2) return i2.status && g2.__staleWhileFetching !== void 0 && (i2.status.returnedStale = true), g2.__staleWhileFetching;
+      if (g2.__returned === g2) throw f;
+    }, _2 = (f, y2) => {
+      let l = this.#M?.(e, n, a2);
+      r.signal.addEventListener("abort", () => {
+        (!i2.ignoreFetchAbort || i2.allowStaleOnFetchAbort) && (f(void 0), i2.allowStaleOnFetchAbort && (f = (S2) => o(S2, true)));
+      }), l && l instanceof Promise ? l.then((S2) => f(S2 === void 0 ? void 0 : S2), y2) : l !== void 0 && f(l);
     };
     i2.status && (i2.status.fetchDispatched = true);
-    let p = new Promise(g2).then(l, c), T2 = Object.assign(p, { __abortController: o, __staleWhileFetching: n, __returned: void 0 });
-    return t === void 0 ? (this.#O(e, T2, { ...h.options, status: void 0 }), t = this.#s.get(e)) : this.#t[t] = T2, T2;
+    let c = new Promise(_2).then(o, p), d2 = Object.assign(c, { __abortController: r, __staleWhileFetching: n, __returned: void 0 });
+    return t === void 0 ? (this.#W(e, d2, { ...a2.options, status: void 0 }), t = this.#s.get(e)) : this.#t[t] = d2, d2;
   }
   #e(e) {
-    if (!this.#W) return false;
+    if (!this.#U) return false;
     let t = e;
     return !!t && t instanceof Promise && t.hasOwnProperty("__staleWhileFetching") && t.__abortController instanceof AbortController;
   }
   fetch(e, t = {}) {
     let i2 = W.hasSubscribers, { status: s = D() ? {} : void 0 } = t;
     t.status = s, s && t.context && (s.context = t.context);
-    let n = this.#B(e, t);
+    let n = this.#k(e, t);
     return s && i2 && (s.trace = true, W.tracePromise(() => n, s).catch(() => {
     })), n;
   }
-  async #B(e, t = {}) {
-    let { allowStale: i2 = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, ttl: o = this.ttl, noDisposeOnSet: r = this.noDisposeOnSet, size: h = 0, sizeCalculation: l = this.sizeCalculation, noUpdateTTL: c = this.noUpdateTTL, noDeleteOnFetchRejection: f = this.noDeleteOnFetchRejection, allowStaleOnFetchRejection: g2 = this.allowStaleOnFetchRejection, ignoreFetchAbort: p = this.ignoreFetchAbort, allowStaleOnFetchAbort: T2 = this.allowStaleOnFetchAbort, context: w2, forceRefresh: y2 = false, status: a2, signal: m2 } = t;
-    if (a2 && (a2.op = "fetch", a2.key = e, y2 && (a2.forceRefresh = true)), !this.#W) return a2 && (a2.fetch = "get"), this.#C(e, { allowStale: i2, updateAgeOnGet: s, noDeleteOnStaleGet: n, status: a2 });
-    let _2 = { allowStale: i2, updateAgeOnGet: s, noDeleteOnStaleGet: n, ttl: o, noDisposeOnSet: r, size: h, sizeCalculation: l, noUpdateTTL: c, noDeleteOnFetchRejection: f, allowStaleOnFetchRejection: g2, allowStaleOnFetchAbort: T2, ignoreFetchAbort: p, status: a2, signal: m2 }, b = this.#s.get(e);
+  async #k(e, t = {}) {
+    let { allowStale: i2 = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, ttl: r = this.ttl, noDisposeOnSet: h = this.noDisposeOnSet, size: a2 = 0, sizeCalculation: o = this.sizeCalculation, noUpdateTTL: p = this.noUpdateTTL, noDeleteOnFetchRejection: m2 = this.noDeleteOnFetchRejection, allowStaleOnFetchRejection: _2 = this.allowStaleOnFetchRejection, ignoreFetchAbort: c = this.ignoreFetchAbort, allowStaleOnFetchAbort: d2 = this.allowStaleOnFetchAbort, context: f, forceRefresh: y2 = false, status: l, signal: S2 } = t;
+    if (l && (l.op = "fetch", l.key = e, y2 && (l.forceRefresh = true), l.cache = this), !this.#U) return l && (l.fetch = "get"), this.#C(e, { allowStale: i2, updateAgeOnGet: s, noDeleteOnStaleGet: n, status: l });
+    let F2 = { allowStale: i2, updateAgeOnGet: s, noDeleteOnStaleGet: n, ttl: r, noDisposeOnSet: h, size: a2, sizeCalculation: o, noUpdateTTL: p, noDeleteOnFetchRejection: m2, allowStaleOnFetchRejection: _2, allowStaleOnFetchAbort: d2, ignoreFetchAbort: c, status: l, signal: S2 }, b = this.#s.get(e);
     if (b === void 0) {
-      a2 && (a2.fetch = "miss");
-      let d2 = this.#P(e, b, _2, w2);
-      return d2.__returned = d2;
+      l && (l.fetch = "miss");
+      let g2 = this.#P(e, b, F2, f);
+      return g2.__returned = g2;
     } else {
-      let d2 = this.#t[b];
-      if (this.#e(d2)) {
-        let E = i2 && d2.__staleWhileFetching !== void 0;
-        return a2 && (a2.fetch = "inflight", E && (a2.returnedStale = true)), E ? d2.__staleWhileFetching : d2.__returned = d2;
+      let g2 = this.#t[b];
+      if (this.#e(g2)) {
+        let v2 = i2 && g2.__staleWhileFetching !== void 0;
+        return l && (l.fetch = "inflight", v2 && (l.returnedStale = true)), v2 ? g2.__staleWhileFetching : g2.__returned = g2;
       }
       let A2 = this.#p(b);
-      if (!y2 && !A2) return a2 && (a2.fetch = "hit"), this.#L(b), s && this.#D(b), a2 && this.#E(a2, b), d2;
-      let z = this.#P(e, b, _2, w2), v2 = z.__staleWhileFetching !== void 0 && i2;
-      return a2 && (a2.fetch = A2 ? "stale" : "refresh", v2 && A2 && (a2.returnedStale = true)), v2 ? z.__staleWhileFetching : z.__returned = z;
+      if (!y2 && !A2) return l && (l.fetch = "hit"), this.#L(b), s && this.#D(b), l && this.#v(l, b), g2;
+      let z = this.#P(e, b, F2, f), E = z.__staleWhileFetching !== void 0 && i2;
+      return l && (l.fetch = A2 ? "stale" : "refresh", E && A2 && (l.returnedStale = true)), E ? z.__staleWhileFetching : z.__returned = z;
     }
   }
   forceFetch(e, t = {}) {
@@ -330736,52 +330737,52 @@ var M = class u3 {
     })), n;
   }
   async #K(e, t = {}) {
-    let i2 = await this.#B(e, t);
+    let i2 = await this.#k(e, t);
     if (i2 === void 0) throw new Error("fetch() returned undefined");
     return i2;
   }
   memo(e, t = {}) {
-    let { status: i2 = S2.hasSubscribers ? {} : void 0 } = t;
-    t.status = i2, i2 && (i2.op = "memo", i2.key = e, t.context && (i2.context = t.context));
+    let { status: i2 = w2.hasSubscribers ? {} : void 0 } = t;
+    t.status = i2, i2 && (i2.op = "memo", i2.key = e, t.context && (i2.context = t.context), i2.cache = this);
     let s = this.#Q(e, t);
-    return i2 && (i2.value = s), S2.hasSubscribers && S2.publish(i2), s;
+    return i2 && (i2.value = s), w2.hasSubscribers && w2.publish(i2), s;
   }
   #Q(e, t = {}) {
-    let i2 = this.#U;
+    let i2 = this.#I;
     if (!i2) throw new Error("no memoMethod provided to constructor");
-    let { context: s, status: n, forceRefresh: o, ...r } = t;
-    n && o && (n.forceRefresh = true);
-    let h = this.#C(e, r), l = o || h === void 0;
-    if (n && (n.memo = l ? "miss" : "hit", l || (n.value = h)), !l) return h;
-    let c = i2(e, h, { options: r, context: s });
-    return n && (n.value = c), this.#O(e, c, r), c;
+    let { context: s, status: n, forceRefresh: r, ...h } = t;
+    n && r && (n.forceRefresh = true);
+    let a2 = this.#C(e, h), o = r || a2 === void 0;
+    if (n && (n.memo = o ? "miss" : "hit", o || (n.value = a2)), !o) return a2;
+    let p = i2(e, a2, { options: h, context: s });
+    return n && (n.value = p), this.#W(e, p, h), p;
   }
   get(e, t = {}) {
-    let { status: i2 = S2.hasSubscribers ? {} : void 0 } = t;
-    t.status = i2, i2 && (i2.op = "get", i2.key = e);
+    let { status: i2 = w2.hasSubscribers ? {} : void 0 } = t;
+    t.status = i2, i2 && (i2.op = "get", i2.key = e, i2.cache = this);
     let s = this.#C(e, t);
-    return i2 && (s !== void 0 && (i2.value = s), S2.hasSubscribers && S2.publish(i2)), s;
+    return i2 && (s !== void 0 && (i2.value = s), w2.hasSubscribers && w2.publish(i2)), s;
   }
   #C(e, t = {}) {
-    let { allowStale: i2 = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, status: o } = t, r = this.#s.get(e);
-    if (r === void 0) {
-      o && (o.get = "miss");
+    let { allowStale: i2 = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, status: r } = t, h = this.#s.get(e);
+    if (h === void 0) {
+      r && (r.get = "miss");
       return;
     }
-    let h = this.#t[r], l = this.#e(h);
-    return o && this.#E(o, r), this.#p(r) ? l ? (o && (o.get = "stale-fetching"), i2 && h.__staleWhileFetching !== void 0 ? (o && (o.returnedStale = true), h.__staleWhileFetching) : void 0) : (n || this.#v(e, "expire"), o && (o.get = "stale"), i2 ? (o && (o.returnedStale = true), h) : void 0) : (o && (o.get = l ? "fetching" : "hit"), this.#L(r), s && this.#D(r), l ? h.__staleWhileFetching : h);
+    let a2 = this.#t[h], o = this.#e(a2);
+    return r && this.#v(r, h), this.#p(h) ? o ? (r && (r.get = "stale-fetching"), i2 && a2.__staleWhileFetching !== void 0 ? (r && (r.returnedStale = true), a2.__staleWhileFetching) : void 0) : (n || this.#E(e, "expire"), r && (r.get = "stale"), i2 ? (r && (r.returnedStale = true), a2) : void 0) : (r && (r.get = o ? "fetching" : "hit"), this.#L(h), s && this.#D(h), o ? a2.__staleWhileFetching : a2);
   }
   #$(e, t) {
-    this.#c[t] = e, this.#a[e] = t;
+    this.#u[t] = e, this.#l[e] = t;
   }
   #L(e) {
-    e !== this.#h && (e === this.#l ? this.#l = this.#a[e] : this.#$(this.#c[e], this.#a[e]), this.#$(this.#h, e), this.#h = e);
+    e !== this.#h && (e === this.#a ? this.#a = this.#l[e] : this.#$(this.#u[e], this.#l[e]), this.#$(this.#h, e), this.#h = e);
   }
   delete(e) {
-    return this.#v(e, "delete");
+    return this.#E(e, "delete");
   }
-  #v(e, t) {
-    S2.hasSubscribers && S2.publish({ op: "delete", delete: t, key: e });
+  #E(e, t) {
+    w2.hasSubscribers && w2.publish({ op: "delete", delete: t, key: e, cache: this });
     let i2 = false;
     if (this.#n !== 0) {
       let s = this.#s.get(e);
@@ -330789,13 +330790,13 @@ var M = class u3 {
       else {
         this.#R(s);
         let n = this.#t[s];
-        if (this.#e(n) ? n.__abortController.abort(new Error("deleted")) : (this.#T || this.#f) && (this.#T && this.#w?.(n, e, t), this.#f && this.#r?.push([n, e, t])), this.#s.delete(e), this.#i[s] = void 0, this.#t[s] = void 0, s === this.#h) this.#h = this.#c[s];
-        else if (s === this.#l) this.#l = this.#a[s];
+        if (this.#e(n) ? n.__abortController.abort(new Error("deleted")) : (this.#T || this.#f) && (this.#T && this.#w?.(n, e, t), this.#f && this.#r?.push([n, e, t])), this.#s.delete(e), this.#i[s] = void 0, this.#t[s] = void 0, s === this.#h) this.#h = this.#u[s];
+        else if (s === this.#a) this.#a = this.#l[s];
         else {
-          let o = this.#c[s];
-          this.#a[o] = this.#a[s];
-          let r = this.#a[s];
-          this.#c[r] = this.#c[s];
+          let r = this.#u[s];
+          this.#l[r] = this.#l[s];
+          let h = this.#l[s];
+          this.#u[h] = this.#u[s];
         }
         this.#n--, this.#y.push(s);
       }
@@ -330823,7 +330824,7 @@ var M = class u3 {
       for (let t of this.#g ?? []) t !== void 0 && clearTimeout(t);
       this.#g?.fill(void 0);
     }
-    if (this.#_ && this.#_.fill(0), this.#l = 0, this.#h = 0, this.#y.length = 0, this.#b = 0, this.#n = 0, this.#f && this.#r) {
+    if (this.#_ && this.#_.fill(0), this.#a = 0, this.#h = 0, this.#y.length = 0, this.#b = 0, this.#n = 0, this.#f && this.#r) {
       let t = this.#r, i2;
       for (; i2 = t?.shift(); ) this.#S?.(...i2);
     }
@@ -338456,7 +338457,7 @@ async function githubAppJwt({
   };
 }
 
-// ../../node_modules/.pnpm/toad-cache@3.7.0/node_modules/toad-cache/dist/toad-cache.mjs
+// ../../node_modules/.pnpm/toad-cache@3.7.1/node_modules/toad-cache/dist/toad-cache.mjs
 init_esm_shims();
 var LruObject = class {
   constructor(max4 = 1e3, ttlInMsecs = 0) {
@@ -341477,7 +341478,7 @@ async function upgradeDependency([name3, tag = "latest"]) {
 var npmRequestLimit = (0, import_p_limit2.default)(40);
 function getPackageInfo(pkgName) {
   return npmRequestLimit(async () => {
-    const getPackageJson = (await import("./package-json-6LRIV6MY.js")).default;
+    const getPackageJson = (await import("./package-json-MWS5EBHM.js")).default;
     return getPackageJson(pkgName, {
       allVersions: true
     });
@@ -342313,7 +342314,7 @@ toad-cache/dist/toad-cache.mjs:
   (**
    * toad-cache
    *
-   * @copyright 2024 Igor Savin <kibertoad@gmail.com>
+   * @copyright 2026 Igor Savin <kibertoad@gmail.com>
    * @license MIT
    * @version 3.7.0
    *)