sia-reactor 0.0.48 → 0.0.49

package/dist/utils.cjs

@@ -1201,29 +1201,29 @@ function cleanKeyCombo(combo, mods = KEYS_MODS) {
   };
   return Array.isArray(combo) ? combo.map(clean) : clean(combo);
 }
-function matchKeys(required, actual, strict = false, clean = true) {
+function matchKeys(required, actual, strict = false, clean = true, allowedMods) {
   if (clean) actual = cleanKeyCombo(actual);
   const match = (req, actual2) => {
     req = cleanKeyCombo(req);
     if (strict) return req === actual2;
     const reqs = req.split("+"), reals = actual2.split("+");
-    for (const mod of KEYS_CMODS) if (reals.includes(mod) && !reqs.includes(mod)) return false;
+    for (const mod of KEYS_CMODS) if (reals.includes(mod) && !reqs.includes(mod) && !allowedMods?.includes(mod)) return false;
     return reqs.every((k) => reals.includes(k));
   };
   return Array.isArray(required) ? required.some((req) => match(req, actual)) : match(required, actual);
 }
 function getTermsForKey(combo, settings) {
-  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatch: stm = false, rankedMatch: ram = true, whitelist = [] } = settings || {};
+  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatch: stm = false, rankedMatch: ram = true, whitelist = [], moddedlist = [] } = settings || {};
   combo = cleanKeyCombo(combo);
   if (matchKeys(overrides, combo, stm, false)) terms.override = true;
   if (matchKeys(blocks, combo, stm, false)) terms.block = true;
-  if (matchKeys(whitelist, combo, false)) terms.whitelisted = true;
-  if (!ram) return terms.action = Object.keys(shortcuts).find((id) => shortcuts[id] && matchKeys(shortcuts[id], combo, stm, false)) || null, terms;
+  if (whitelist.some((w) => matchKeys(w, combo, false, true, moddedlist.includes(cleanKeyCombo(w)) ? KEYS_CMODS : void 0))) terms.whitelisted = true;
+  if (!ram) return terms.action = Object.keys(shortcuts).find((id) => shortcuts[id] && matchKeys(shortcuts[id], combo, stm, false, moddedlist.includes(id) ? KEYS_CMODS : void 0)) || null, terms;
   let bestA = null, bestE = false, bestL = 0;
   for (const id of Object.keys(shortcuts))
     for (const c of Array.isArray(shortcuts[id]) ? shortcuts[id] : [shortcuts[id]]) {
       const req = c && cleanKeyCombo(c), isE = req === combo, len = req ? req.split("+").length : 0;
-      if (c && matchKeys(req, combo, stm, false) && (!bestA || isE && !bestE || isE === bestE && len > bestL)) bestA = id, bestE = isE, bestL = len;
+      if (c && matchKeys(req, combo, stm, false, moddedlist.includes(id) ? KEYS_CMODS : void 0) && (!bestA || isE && !bestE || isE === bestE && len > bestL)) bestA = id, bestE = isE, bestL = len;
     }
   return terms.action = bestA, terms;
 }