@witchcraft/expressit 0.2.0 → 0.2.1

package/dist/Lexer.js

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { isBlank } from "@alanscodelog/utils/isBlank.js";
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn.js";
 import { checkParserOpts } from "./internal/checkParserOpts.js";
@@ -76,8 +73,7 @@ function matchWhileCharNotEqualToUnescaped(char) {
       end++;
       c = input[end];
     }
-    if (start === end)
-      return false;
+    if (start === end) return false;
     return input.slice(start, end);
   };
 }
@@ -119,12 +115,9 @@ class Lexer {
     const syms = [...symOrs, ...symAnds, ...symNots];
     const customPropertyOperators = opts.customPropertyOperators ?? [];
     const expandedPropertySeparator = opts.expandedPropertySeparator ?? "";
-    if (expandedPropertySeparator)
-      syms.push(expandedPropertySeparator);
-    if (customPropertyOperators.length > 0)
-      pushIfNotIn(syms, customPropertyOperators);
-    if (opts.regexValues)
-      syms.push("\\/");
+    if (expandedPropertySeparator) syms.push(expandedPropertySeparator);
+    if (customPropertyOperators.length > 0) pushIfNotIn(syms, customPropertyOperators);
+    if (opts.regexValues) syms.push("\\/");
     if (opts.arrayValues) {
       syms.push("\\[");
     }
@@ -169,8 +162,7 @@ class Lexer {
             end++;
             c = input[end];
           }
-          if (start === end)
-            return false;
+          if (start === end) return false;
           return input.slice(start, end);
         }
       }),
@@ -196,8 +188,7 @@ class Lexer {
               end += match.input.length;
             }
             return input.slice(start, end);
-          } else
-            return false;
+          } else return false;
         }
       }),
       [
@@ -210,10 +201,8 @@ class Lexer {
           let inGroup = 0;
           let prevEscaped = false;
           while (c !== void 0 && (c !== "/" || inGroup > 0 || prevEscaped)) {
-            if (c === "[")
-              inGroup++;
-            if (c === "]" && inGroup > 0)
-              inGroup--;
+            if (c === "[") inGroup++;
+            if (c === "]" && inGroup > 0) inGroup--;
             if (c === "\\") {
               if (!prevEscaped) {
                 prevEscaped = true;
@@ -226,8 +215,7 @@ class Lexer {
             end++;
             c = input[end];
           }
-          if (start === end)
-            return false;
+          if (start === end) return false;
           return input.slice(start, end);
         }
       }),
@@ -253,8 +241,7 @@ class Lexer {
             case "MAIN":
               return "NOT_SINGLE";
             default:
-              if (mode.startsWith(BRACKET_PREFIX))
-                return "BRACKET_MAIN";
+              if (mode.startsWith(BRACKET_PREFIX)) return "BRACKET_MAIN";
               return "MAIN";
           }
         },
@@ -267,8 +254,7 @@ class Lexer {
         push: (mode, tokens) => {
           const previous = tokens[tokens.length - 2];
           if ((previous == null ? void 0 : previous.type) === "VALUE_NOT_DOUBLE" || (previous == null ? void 0 : previous.type) === "VALUE_UNQUOTED") {
-            if (mode.startsWith(BRACKET_PREFIX))
-              return "BRACKET_MAIN";
+            if (mode.startsWith(BRACKET_PREFIX)) return "BRACKET_MAIN";
             return "MAIN";
           }
           switch (mode) {
@@ -277,8 +263,7 @@ class Lexer {
             case "MAIN":
               return "NOT_DOUBLE";
             default:
-              if (mode.startsWith(BRACKET_PREFIX))
-                return "BRACKET_MAIN";
+              if (mode.startsWith(BRACKET_PREFIX)) return "BRACKET_MAIN";
               return "MAIN";
           }
         },
@@ -299,8 +284,7 @@ class Lexer {
             case "MAIN":
               return "NOT_BACKTICK";
             default:
-              if (mode.startsWith(BRACKET_PREFIX))
-                return "BRACKET_MAIN";
+              if (mode.startsWith(BRACKET_PREFIX)) return "BRACKET_MAIN";
               return "MAIN";
           }
         },
@@ -350,8 +334,7 @@ class Lexer {
                   break;
                 }
               }
-              if (found)
-                break;
+              if (found) break;
             }
             if (c === " " || c === "	" || c === "(" || c === ")" || c === "'" || c === '"' || c === "`" || c === "\\" || mode === "BRACKET_MAIN" && c === "]") {
               break;
@@ -359,8 +342,7 @@ class Lexer {
             end++;
             c = input[end];
           }
-          if (start === end)
-            return false;
+          if (start === end) return false;
           return input.slice(start, end);
         }
       }),
@@ -424,8 +406,7 @@ class Lexer {
           matches: (_c, input, start) => {
             for (const op of opts.expandedPropertySeparator) {
               const chars = input.slice(start, start + op.length);
-              if (chars === op)
-                return op;
+              if (chars === op) return op;
             }
             return false;
           }
@@ -439,8 +420,7 @@ class Lexer {
           matches: (_c, input, start) => {
             for (const op of opts.customPropertyOperators ?? []) {
               const chars = input.slice(start, start + op.length);
-              if (chars === op)
-                return op;
+              if (chars === op) return op;
             }
             return false;
           }
@@ -930,8 +910,7 @@ class Lexer {
           const newIndex = index + matchLength;
           const val = match === true ? c : match;
           const token = createToken(type, val, index, newIndex - 1);
-          if (!t.skip)
-            tokens.push(token);
+          if (!t.skip) tokens.push(token);
           if (t.push) {
             mode = typeof t.push === "function" ? t.push(mode, tokens) : t.push;
             branch = branches[mode];

package/dist/Parser.js

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { get } from "@alanscodelog/utils/get.js";
 import { insert } from "@alanscodelog/utils/insert.js";
 import { isArray } from "@alanscodelog/utils/isArray.js";
@@ -37,11 +34,9 @@ const OPPOSITE = {
   [TOKEN_TYPE.OR]: TOKEN_TYPE.AND
 };
 function isEqualSet(setA, setB) {
-  if (setA.size !== setB.size)
-    return false;
+  if (setA.size !== setB.size) return false;
   for (const key of setA) {
-    if (!setB.has(key))
-      return false;
+    if (!setB.has(key)) return false;
   }
   return true;
 }
@@ -58,8 +53,7 @@ const createDefaultRequires = (partial = {}) => ({
   prefix: partial.prefix ?? false
 });
 const tokenRequiresWhitespace = (valid, whitespace, wordOps) => {
-  if (whitespace || valid === void 0)
-    return false;
+  if (whitespace || valid === void 0) return false;
   return valid.type === TOKEN_TYPE.VALUE || [TOKEN_TYPE.AND, TOKEN_TYPE.OR, TOKEN_TYPE.NOT].includes(valid.type) && wordOps.find((_) => _.value === valid.value) !== void 0;
 };
 const tokenVariable = [TOKEN_TYPE.BACKTICK, TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.SINGLEQUOTE, TOKEN_TYPE.VALUE, TOKEN_TYPE.REGEX];
@@ -180,13 +174,10 @@ class Parser {
     return false;
   }
   isType(token2, type) {
-    if (token2 === void 0)
-      return false;
-    if (token2.type === type)
-      return true;
+    if (token2 === void 0) return false;
+    if (token2.type === type) return true;
     const tokenType = this.getTokenType(token2.type);
-    if ((tokenType == null ? void 0 : tokenType.type) === type)
-      return true;
+    if ((tokenType == null ? void 0 : tokenType.type) === type) return true;
     const category = this.$categories[type];
     if ((category == null ? void 0 : category.entries[token2.type]) !== void 0) {
       return true;
@@ -327,13 +318,11 @@ class Parser {
       }
       this.restoreState(state);
     }
-    if (type === "AND" && pairs.length === 0)
-      return void 0;
+    if (type === "AND" && pairs.length === 0) return void 0;
     let res = pairs[pairs.length - 1][0];
     for (let i = pairs.length - 1; i > 0; i--) {
       const before = pairs[i - 1];
-      if (type === "OR" && res === void 0 && before === void 0)
-        return void 0;
+      if (type === "OR" && res === void 0 && before === void 0) return void 0;
       res = expression(before[0], before[1], res);
     }
     return res;
@@ -371,8 +360,7 @@ class Parser {
       }
       return group(not, value, ...group$1);
     }
-    if ([not, property, value].every((_) => _ === void 0))
-      return void 0;
+    if ([not, property, value].every((_) => _ === void 0)) return void 0;
     return condition(not, property == null ? void 0 : property.prop, property == null ? void 0 : property.rest, value);
   }
   ruleConditionValue(property, { convertRegexValues = false, convertArrayValues = false } = {}) {
@@ -383,23 +371,19 @@ class Parser {
     if (this.options.prefixableGroups && property === void 0 && (next == null ? void 0 : next.type) !== $T.PAREN_L && (this.isType(next, $C.VALUE) && (this.isType(next2, $T.PAREN_L) || this.isType(next2, $C.QUOTE_ANY) && this.isType(next3, $T.PAREN_L)) || this.isType(next, $C.QUOTE_ANY) && (this.isType(next2, $T.PAREN_L) || this.isType(next2, $C.VALUE) && (this.isType(next3, $T.PAREN_L) || // "a(
     this.isType(next3, $C.QUOTE_ANY) && this.isType(next4, $T.PAREN_L))))) {
       const res = this.ruleVariable({ unprefixed: true });
-      if (res)
-        return res;
+      if (res) return res;
     }
     if (!this.isType(next, $T.PAREN_L)) {
       const res = this.ruleVariable({ unprefixed: false });
-      if (res)
-        return res;
+      if (res) return res;
     }
     if (this.isType(next, $T.PAREN_L)) {
       const res = this.rulePlainGroup({ onlyValues: property !== void 0, convertRegexValues, convertArrayValues });
-      if (res)
-        return res;
+      if (res) return res;
     }
     if (this.isType(next, $T.BRACKET_L)) {
       const res = this.rulePlainBracketGroup({ convertArrayValues });
-      if (res)
-        return res;
+      if (res) return res;
     }
     return void 0;
   }
@@ -457,8 +441,7 @@ class Parser {
       }
     }
     const bracketR = this.isType(this.peek(1), $T.BRACKET_R) ? this.ruleBracketR() : void 0;
-    if (bracketL === void 0)
-      throw new Error("bracketL is undefined, peek before using rule.");
+    if (bracketL === void 0) throw new Error("bracketL is undefined, peek before using rule.");
     if (!convertArrayValues) {
       return array(bracketL, values, bracketR);
     }
@@ -640,8 +623,7 @@ class Parser {
     if (!unprefixed && this.options.prefixableStrings !== void 0 && this.isType(next2, $C.QUOTE_ANY) && next2 && this.isType(next4, next2.type) && next && this.options.prefixableStrings.includes(next.value)) {
       return this.ruleValueUnquoted({ onlyToken });
     }
-    if (onlyToken)
-      return void 0;
+    if (onlyToken) return void 0;
     return token.value(...this.processToken());
   }
   ruleValueUnquoted({
@@ -860,8 +842,7 @@ class Parser {
       };
       for (const error of surroundingErrors) {
         for (const type of error.expected) {
-          if (errorTypesHandled.includes(type))
-            continue;
+          if (errorTypesHandled.includes(type)) continue;
           errorTypesHandled.push(type);
           switch (type) {
             case TOKEN_TYPE.DOUBLEQUOTE:
@@ -903,10 +884,8 @@ class Parser {
                 }),
                 range: pos({ start: index }, { fill: true })
               });
-              if (type === TOKEN_TYPE.AND)
-                errorTypesHandled.push(TOKEN_TYPE.OR);
-              if (type === TOKEN_TYPE.OR)
-                errorTypesHandled.push(TOKEN_TYPE.AND);
+              if (type === TOKEN_TYPE.AND) errorTypesHandled.push(TOKEN_TYPE.OR);
+              if (type === TOKEN_TYPE.OR) errorTypesHandled.push(TOKEN_TYPE.AND);
               break;
             case TOKEN_TYPE.PARENL:
             case TOKEN_TYPE.PARENR:
@@ -1177,16 +1156,14 @@ class Parser {
   getBestIndexes(indexes, existing, sortIndex = "") {
     indexes = indexes.filter((set) => {
       for (const key of set) {
-        if (!existing.has(key))
-          return false;
+        if (!existing.has(key)) return false;
       }
       return true;
     });
     let finalIndexes = indexes;
     if (existing.has(sortIndex)) {
       const indexesWithSortIndex = indexes.filter((set) => set.has(sortIndex));
-      if (indexesWithSortIndex.length > 0)
-        finalIndexes = indexesWithSortIndex;
+      if (indexesWithSortIndex.length > 0) finalIndexes = indexesWithSortIndex;
     }
     let smallest = Infinity;
     if (existing instanceof Map) {
@@ -1230,8 +1207,7 @@ class Parser {
         const allKeys = /* @__PURE__ */ new Set();
         for (const leftSet of left) {
           const exists = sets.find((set) => isEqualSet(set, leftSet));
-          if (exists)
-            continue;
+          if (exists) continue;
           sets.push(leftSet);
           for (const key of leftSet) {
             allKeys.add(key);
@@ -1239,22 +1215,19 @@ class Parser {
         }
         for (const rightSet of right) {
           const exists = sets.find((set) => isEqualSet(set, rightSet));
-          if (exists)
-            continue;
+          if (exists) continue;
           sets.push(rightSet);
           for (const key of rightSet) {
             allKeys.add(key);
           }
         }
         const commonKeys = /* @__PURE__ */ new Set();
-        outerCheck:
-          for (const key of allKeys) {
-            for (const set of sets) {
-              if (!set.has(key))
-                continue outerCheck;
-            }
-            commonKeys.add(key);
+        outerCheck: for (const key of allKeys) {
+          for (const set of sets) {
+            if (!set.has(key)) continue outerCheck;
           }
+          commonKeys.add(key);
+        }
         if (commonKeys.size > 0) {
           return [commonKeys, allKeys];
         } else {
@@ -1424,11 +1397,9 @@ class Parser {
           condition: ast
         };
         const res = opts.valueValidator(contextValue, query, context);
-        if (res && !isArray(res))
-          throw new Error("The valueValidator must return an array or nothing/undefined");
+        if (res && !isArray(res)) throw new Error("The valueValidator must return an array or nothing/undefined");
         if (res) {
-          for (const entry of res)
-            results.push(entry);
+          for (const entry of res) results.push(entry);
         }
       } else {
         let name = unescape(ast.property.value.value);
@@ -1436,16 +1407,14 @@ class Parser {
           name = applyPrefix(prefix, name, opts.prefixApplier);
         }
         const boolValue = applyBoolean(groupValue, ast.operator === void 0);
-        if (ast.property)
-          prefixes.push(ast.property);
+        if (ast.property) prefixes.push(ast.property);
         const operator22 = ast.propertyOperator;
         self_.validate(ast.value, context, name, boolValue, results, prefixes, operator22);
       }
     }
     if (ast.type === AST_TYPE.GROUP) {
       const _prefix = ((_j = ast.prefix) == null ? void 0 : _j.type) === AST_TYPE.CONDITION && ast.prefix.value.type === AST_TYPE.VARIABLE ? ast.prefix.value : void 0;
-      if (_prefix)
-        prefixes.push(_prefix);
+      if (_prefix) prefixes.push(_prefix);
       const _groupValue = ((_k = ast.prefix) == null ? void 0 : _k.type) === AST_TYPE.CONDITION ? ast.prefix.operator === void 0 : !(((_l = ast.prefix) == null ? void 0 : _l.valid) === true);
       self_.validate(ast.expression, context, applyPrefix(prefix, (_prefix == null ? void 0 : _prefix.value.value) ?? "", opts.prefixApplier), applyBoolean(groupValue, _groupValue), results, prefixes, operator2);
     }

package/dist/ast/builders/condition.js

@@ -15,10 +15,8 @@ function condition(value, not = true, property, propertyOperator, { right, left
   }
   if (right || left) {
     node.sep = {};
-    if (right)
-      node.sep.right = right;
-    if (left)
-      node.sep.left = left;
+    if (right) node.sep.right = right;
+    if (left) node.sep.left = left;
   }
   return createConditionNode(node);
 }

package/dist/ast/builders/delim.js

@@ -2,10 +2,8 @@ import { type } from "./type.js";
 import { TOKEN_TYPE } from "../../types/ast.js";
 function delim(left = false, right = false) {
   let quoteType;
-  if (typeof left === "string")
-    quoteType = type(left);
-  else if (typeof right === "string")
-    quoteType = type(right);
+  if (typeof left === "string") quoteType = type(left);
+  else if (typeof right === "string") quoteType = type(right);
   const opts = {
     left: left === true || typeof left === "string" && left !== void 0,
     right: right === true || typeof right === "string" && right !== void 0

package/dist/ast/builders/expression.js

@@ -12,8 +12,7 @@ function expression(left, operator, right) {
   let op;
   if (operator === void 0) {
     operator = token([TOKEN_TYPE.AND, TOKEN_TYPE.OR], void 0, { start: left.end });
-  } else
-    op = operator;
+  } else op = operator;
   if (right === void 0) {
     right = token(TOKEN_TYPE.VALUE, void 0, { start: op.end });
   }

package/dist/ast/builders/pos.js

@@ -4,8 +4,7 @@ function pos(start, end) {
     return { start, end };
   } else {
     const item = start;
-    if (item === void 0)
-      return {};
+    if (item === void 0) return {};
     const fill = typeof end === "object" ? end.fill : false;
     if (isFullPos(item)) {
       return { start: item.start, end: item.end };
@@ -13,10 +12,8 @@ function pos(start, end) {
       if (fill) {
         let start2 = item.start;
         let end2 = item.end;
-        if (start2 !== void 0 && end2 === void 0)
-          end2 = start2;
-        if (end2 !== void 0 && start2 === void 0)
-          start2 = end2;
+        if (start2 !== void 0 && end2 === void 0) end2 = start2;
+        if (end2 !== void 0 && start2 === void 0) start2 = end2;
         return { start: start2, end: end2 };
       }
       return {};

package/dist/ast/builders/variable.js

@@ -16,16 +16,14 @@ function variable(prefix, value, quote, position) {
     node.quote = {};
     const quoteLeftPos = (position == null ? void 0 : position.start) !== void 0 ? pos({ start: position.start }, { fill: true }) : void 0;
     if (quote.left) {
-      if (quoteLeftPos)
-        quoteLeftPos.start -= 1;
+      if (quoteLeftPos) quoteLeftPos.start -= 1;
       node.quote.left = token(quote.type, quoteFromType(quote.type), quoteLeftPos);
     } else {
       node.quote.left = token(quote.type, void 0, quoteLeftPos);
     }
     const quoteRightPos = (position == null ? void 0 : position.end) !== void 0 ? pos({ end: position.end }, { fill: true }) : void 0;
     if (quote.right) {
-      if (quoteRightPos)
-        quoteRightPos.end += 1;
+      if (quoteRightPos) quoteRightPos.end += 1;
       node.quote.right = token(quote.type, quoteFromType(quote.type), quoteRightPos);
     } else {
       node.quote.right = token(quote.type, void 0, quoteRightPos);

package/dist/ast/error.js

@@ -1,7 +1,6 @@
 import { createToken } from "./createToken.js";
 function error(pos, expected) {
-  if (pos === void 0)
-    throw new Error("should never happen, passed undefined position for error token");
+  if (pos === void 0) throw new Error("should never happen, passed undefined position for error token");
   return createToken({ expected, start: pos, end: pos });
 }
 export {

package/dist/ast/handlers.js

@@ -6,8 +6,7 @@ import { createToken } from "./createToken.js";
 import { createVariableNode } from "./createVariableNode.js";
 import { TOKEN_TYPE, AST_TYPE } from "../types/ast.js";
 function error(pos, expected) {
-  if (pos === void 0)
-    throw new Error("should never happen, passed undefined position for error token");
+  if (pos === void 0) throw new Error("should never happen, passed undefined position for error token");
   return createToken({ expected, start: pos, end: pos });
 }
 const operators = (type) => (value, pos) => createToken({ value, type, ...pos });
@@ -75,10 +74,8 @@ function condition(not, property, { propertyOperator, sepL, sepR } = {}, value)
   if (not) {
     node.operator = not;
   }
-  if (property)
-    node.property = property;
-  if (propertyOperator)
-    node.propertyOperator = propertyOperator;
+  if (property) node.property = property;
+  if (propertyOperator) node.propertyOperator = propertyOperator;
   if (sepL || sepR) {
     node.sep = {};
     if (sepL) {
@@ -86,8 +83,7 @@ function condition(not, property, { propertyOperator, sepL, sepR } = {}, value)
       node.property || (node.property = error(sepL.start, [TOKEN_TYPE.VALUE]));
       node.propertyOperator || (node.propertyOperator = error((sepL == null ? void 0 : sepL.end) ?? (sepR == null ? void 0 : sepR.start), [TOKEN_TYPE.VALUE]));
     }
-    if (sepR)
-      node.sep.right = sepR;
+    if (sepR) node.sep.right = sepR;
     else if (!node.value || node.value.type === AST_TYPE.VARIABLE) {
       node.sep.right = error(((_a = node.value) == null ? void 0 : _a.start) ?? end, [TOKEN_TYPE.OP_EXPANDED_SEP]);
     }

package/dist/defaults/defaultKeyParser.js

@@ -1,6 +1,5 @@
 const defaultKeyParser = function defaultKeyParser2(value) {
-  if (value === void 0)
-    return [];
+  if (value === void 0) return [];
   return [value];
 };
 export {

package/dist/examples/shortcutContextParser.js

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { Parser } from "../Parser.js";
 class ShortcutContextParser extends Parser {
   constructor(dummyContext, validRegexFlags = ["i", "u", "m"]) {
@@ -67,16 +64,14 @@ class ShortcutContextParser extends Parser {
             }
           }
         }
-        if (tokens.length > 0)
-          return tokens;
+        if (tokens.length > 0) return tokens;
       },
       conditionNormalizer({ operator, value, regexFlags, isRegex, isNegated, isQuoted }) {
         let finalValue = value;
         let finalOperator = operator;
         if (typeof value === "string" && !isQuoted) {
           const asNum = parseInt(value, 2);
-          if (!isNaN(asNum))
-            finalValue = asNum;
+          if (!isNaN(asNum)) finalValue = asNum;
           if (["true", "false"].includes(value)) {
             finalValue = value === "true";
           }
@@ -118,8 +113,7 @@ class ShortcutContextParser extends Parser {
           this.regexablekeys.push(prev ? `${prev}.${key}` : key);
         }
       } else {
-        if (typeof context[key] !== "object")
-          throw new Error("A dummy context value must be a boolean or an object.");
+        if (typeof context[key] !== "object") throw new Error("A dummy context value must be a boolean or an object.");
         this._extractKeysFromContext(context[key], prev ? `${prev}.${key}` : key);
       }
     }

package/dist/internal/ExpressitError.js

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { crop } from "@alanscodelog/utils/crop.js";
 import { indent } from "@alanscodelog/utils/indent.js";
 import { pretty } from "@alanscodelog/utils/pretty.js";

package/dist/internal/checkParserOpts.js

@@ -16,10 +16,8 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
       ...opts.regexValues ? ["/"] : []
     ];
     const extra = [];
-    if (opts.expandedPropertySeparator)
-      extra.push(opts.expandedPropertySeparator);
-    if (opts.customPropertyOperators)
-      pushIfNotIn(extra, opts.customPropertyOperators);
+    if (opts.expandedPropertySeparator) extra.push(opts.expandedPropertySeparator);
+    if (opts.customPropertyOperators) pushIfNotIn(extra, opts.customPropertyOperators);
     if (opts.expandedPropertySeparator && isBlank(opts.expandedPropertySeparator)) {
       throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
@@ -84,14 +82,10 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
   }
   if (evaluatorChecks) {
     const requireCustomNormalizer = [];
-    if ((((_g = opts.prefixableStrings) == null ? void 0 : _g.length) ?? 0) > 0)
-      requireCustomNormalizer.push("prefixableStrings");
-    if ((((_h = opts.customPropertyOperators) == null ? void 0 : _h.length) ?? 0) > 0)
-      requireCustomNormalizer.push("customPropertyOperators");
-    if ((((_i = opts.expandedPropertySeparator) == null ? void 0 : _i.length) ?? 0) > 0)
-      requireCustomNormalizer.push("expandedPropertySeparator");
-    if (opts.regexValues)
-      requireCustomNormalizer.push("regexValues");
+    if ((((_g = opts.prefixableStrings) == null ? void 0 : _g.length) ?? 0) > 0) requireCustomNormalizer.push("prefixableStrings");
+    if ((((_h = opts.customPropertyOperators) == null ? void 0 : _h.length) ?? 0) > 0) requireCustomNormalizer.push("customPropertyOperators");
+    if ((((_i = opts.expandedPropertySeparator) == null ? void 0 : _i.length) ?? 0) > 0) requireCustomNormalizer.push("expandedPropertySeparator");
+    if (opts.regexValues) requireCustomNormalizer.push("regexValues");
     if (requireCustomNormalizer.length > 0 && opts.conditionNormalizer === defaultConditionNormalizer) {
       throw new ExpressitError(
         ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
@@ -100,10 +94,8 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
       );
     }
     const requireCustomComparer = [];
-    if (opts.regexValues)
-      requireCustomComparer.push("regexValues");
-    if (opts.regexValues)
-      requireCustomComparer.push("arrayValues");
+    if (opts.regexValues) requireCustomComparer.push("regexValues");
+    if (opts.regexValues) requireCustomComparer.push("arrayValues");
     if (requireCustomComparer.length > 0 && opts.valueComparer === defaultValueComparer) {
       throw new ExpressitError(
         ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,

package/dist/internal/escapeVariableOrPrefix.js

@@ -2,16 +2,14 @@ import { multisplice } from "@alanscodelog/utils/multisplice.js";
 function escapeVariableOrPrefix(variable, preferredQuote) {
   let doQuote = false;
   for (const quoteType of ['"', "'", "`"]) {
-    if (!variable.includes(quoteType) && !variable.includes(" "))
-      continue;
+    if (!variable.includes(quoteType) && !variable.includes(" ")) continue;
     if (variable.startsWith(quoteType) && variable.endsWith(quoteType)) {
       break;
     }
     const indexes = [];
     for (let i = 0; i < variable.length; i++) {
       const char = variable[i];
-      if (char === void 0)
-        break;
+      if (char === void 0) break;
       if (char === "\\") {
         i += 2;
         continue;
@@ -19,11 +17,9 @@ function escapeVariableOrPrefix(variable, preferredQuote) {
       if (char === " ") {
         doQuote = true;
       }
-      if (char === quoteType)
-        indexes.push(i);
+      if (char === quoteType) indexes.push(i);
     }
-    if (indexes.length === 0)
-      break;
+    if (indexes.length === 0) break;
     const newVal = multisplice(variable.split(""), indexes, 0, "\\").array.join("");
     variable = newVal;
     break;

package/dist/package.json.js

@@ -1,6 +1,6 @@
 const name = "@witchcraft/expressit";
 const description = "A blazing fast, customizable, error-tolerant expression parser that creates safe to eval expressions + a few other goodies like autocomplete.";
-const version = "0.2.0";
+const version = "0.2.1";
 const types = "./dist/index.d.ts";
 const type = "module";
 const module = "./dist/index.js";

package/dist/utils/generateParentsMap.js

@@ -7,63 +7,43 @@ function generateParentsMap(ast) {
   const map = recursiveMap ?? /* @__PURE__ */ new Map();
   const self = generateParentsMap;
   if (ast.type === AST_TYPE.VARIABLE) {
-    if (ast.prefix)
-      map.set(ast.prefix, ast);
-    if ((_a = ast.quote) == null ? void 0 : _a.left)
-      map.set(ast.quote.left, ast);
-    if ((_b = ast.quote) == null ? void 0 : _b.right)
-      map.set(ast.quote.right, ast);
-    if ((_c = ast.quote) == null ? void 0 : _c.flags)
-      map.set(ast.quote.flags, ast);
+    if (ast.prefix) map.set(ast.prefix, ast);
+    if ((_a = ast.quote) == null ? void 0 : _a.left) map.set(ast.quote.left, ast);
+    if ((_b = ast.quote) == null ? void 0 : _b.right) map.set(ast.quote.right, ast);
+    if ((_c = ast.quote) == null ? void 0 : _c.flags) map.set(ast.quote.flags, ast);
     map.set(ast.value, ast);
   } else if (ast.type === AST_TYPE.CONDITION) {
-    if (ast.operator)
-      map.set(ast.operator, ast);
+    if (ast.operator) map.set(ast.operator, ast);
     if (ast.property) {
       map.set(ast.property, ast);
-      if (isNode(ast.property))
-        self(ast.property, map);
+      if (isNode(ast.property)) self(ast.property, map);
     }
-    if (ast.propertyOperator)
-      map.set(ast.propertyOperator, ast);
-    if ((_d = ast.sep) == null ? void 0 : _d.left)
-      map.set(ast.sep.left, ast);
-    if ((_e = ast.sep) == null ? void 0 : _e.right)
-      map.set(ast.sep.right, ast);
+    if (ast.propertyOperator) map.set(ast.propertyOperator, ast);
+    if ((_d = ast.sep) == null ? void 0 : _d.left) map.set(ast.sep.left, ast);
+    if ((_e = ast.sep) == null ? void 0 : _e.right) map.set(ast.sep.right, ast);
     map.set(ast.value, ast);
-    if (isNode(ast.value))
-      self(ast.value, map);
+    if (isNode(ast.value)) self(ast.value, map);
   } else if (ast.type === AST_TYPE.EXPRESSION) {
-    if (ast.operator)
-      map.set(ast.operator, ast);
+    if (ast.operator) map.set(ast.operator, ast);
     map.set(ast.right, ast);
-    if (isNode(ast.right))
-      self(ast.right, map);
+    if (isNode(ast.right)) self(ast.right, map);
     map.set(ast.left, ast);
-    if (isNode(ast.left))
-      self(ast.left, map);
+    if (isNode(ast.left)) self(ast.left, map);
   } else if (ast.type === AST_TYPE.GROUP) {
     if (ast.prefix) {
       map.set(ast.prefix, ast);
-      if (isNode(ast.prefix))
-        self(ast.prefix, map);
+      if (isNode(ast.prefix)) self(ast.prefix, map);
     }
-    if ((_f = ast.paren) == null ? void 0 : _f.left)
-      map.set(ast.paren.left, ast);
-    if ((_g = ast.paren) == null ? void 0 : _g.right)
-      map.set(ast.paren.right, ast);
+    if ((_f = ast.paren) == null ? void 0 : _f.left) map.set(ast.paren.left, ast);
+    if ((_g = ast.paren) == null ? void 0 : _g.right) map.set(ast.paren.right, ast);
     map.set(ast.expression, ast);
-    if (isNode(ast.expression))
-      self(ast.expression, map);
+    if (isNode(ast.expression)) self(ast.expression, map);
   } else if (ast.type === AST_TYPE.ARRAY) {
-    if (ast.bracket.left)
-      map.set(ast.bracket.left, ast);
-    if (ast.bracket.right)
-      map.set(ast.bracket.right, ast);
+    if (ast.bracket.left) map.set(ast.bracket.left, ast);
+    if (ast.bracket.right) map.set(ast.bracket.right, ast);
     for (const val of ast.values) {
       map.set(val, ast);
-      if (isNode(val))
-        self(val, map);
+      if (isNode(val)) self(val, map);
     }
   }
   return map;

package/dist/utils/getCursorInfo.js

@@ -55,28 +55,20 @@ function setWhitespaceBetween(input, index, side, info) {
   if (info.at) {
     if (info.valid[side]) {
       const nextTokStart = info.valid[side][oppositePos];
-      if (info.at[pos] !== nextTokStart)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (info.at[pos] !== nextTokStart) info.whitespace[side] = true;
+      else return;
     } else {
-      if (info.at[pos] !== limit)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (info.at[pos] !== limit) info.whitespace[side] = true;
+      else return;
     }
   } else {
     if (info.valid[side]) {
       const nextTokStart = info.valid[side][oppositePos];
-      if (index !== nextTokStart)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (index !== nextTokStart) info.whitespace[side] = true;
+      else return;
     } else {
-      if (index !== limit)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (index !== limit) info.whitespace[side] = true;
+      else return;
     }
   }
 }

package/dist/utils/getOppositeDelimiter.js

@@ -6,8 +6,7 @@ import { isQuote } from "./isQuote.js";
 import { TOKEN_TYPE } from "../types/ast.js";
 function getOppositeDelimiter(token, parentsMap) {
   const parent = parentsMap.get(token);
-  if (!isDelimiter(token))
-    throw new Error("Token is not a delimiter type.");
+  if (!isDelimiter(token)) throw new Error("Token is not a delimiter type.");
   if (isParen(token)) {
     const paren = parent.paren;
     const opposite = paren.left === token ? "right" : "left";
@@ -18,14 +17,12 @@ function getOppositeDelimiter(token, parentsMap) {
     return bracket[opposite];
   } else if (isQuote(token)) {
     const quotes = parent.quote;
-    if (quotes === void 0)
-      unreachable();
+    if (quotes === void 0) unreachable();
     const opposite = quotes.left === token ? "right" : "left";
     return quotes[opposite];
   } else if (token.type === TOKEN_TYPE.OP_EXPANDED_SEP) {
     const sep = parent.sep;
-    if (sep === void 0)
-      unreachable();
+    if (sep === void 0) unreachable();
     const opposite = sep.left === token ? "right" : "left";
     return sep[opposite];
   }

package/dist/utils/prettyAst.js

@@ -28,8 +28,7 @@ function prettyAst(ast, { indent = "   ", children = "├╴", last = "└╴",
   const _ = indent;
   const __ = arguments[3] ?? "";
   let extra = arguments[4] ?? "";
-  if (!isBlank(extra))
-    extra = ` ${c.hint}${extra}${c.reset}`;
+  if (!isBlank(extra)) extra = ` ${c.hint}${extra}${c.reset}`;
   const ___ = __ + _ + branch;
   const __L = __ + _ + indent[0];
   const prettyAst_ = prettyAst;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@witchcraft/expressit",
 	"description": "A blazing fast, customizable, error-tolerant expression parser that creates safe to eval expressions + a few other goodies like autocomplete.",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"types": "./dist/index.d.ts",
 	"type": "module",
 	"module": "./dist/index.js",