@witchcraft/expressit 0.3.0 → 0.4.0

package/dist/ast/builders/array.js

@@ -2,17 +2,16 @@ import { token } from "./token.js";
 import { TOKEN_TYPE } from "../../types/ast.js";
 import { createArrayNode } from "../createArrayNode.js";
 function array(values, bracket = { right: true, left: true }, parenLeftPos, parenRightPos) {
-  var _a, _b, _c, _d, _e, _f;
   const node = {
     values
   };
   node.bracket = {};
-  const start = ((_a = values[0]) == null ? void 0 : _a.start) ?? (parenLeftPos == null ? void 0 : parenLeftPos.end);
-  const end = ((_b = values[values.length - 1]) == null ? void 0 : _b.end) ?? (parenRightPos == null ? void 0 : parenRightPos.start) ?? (parenLeftPos == null ? void 0 : parenLeftPos.end);
-  parenLeftPos ?? (parenLeftPos = start !== void 0 ? { start: start - 1, end: start } : void 0);
-  parenRightPos ?? (parenRightPos = end !== void 0 ? { start: end, end: end + 1 } : void 0);
+  const start = values[0]?.start ?? parenLeftPos?.end;
+  const end = values[values.length - 1]?.end ?? parenRightPos?.start ?? parenLeftPos?.end;
+  parenLeftPos ??= start !== void 0 ? { start: start - 1, end: start } : void 0;
+  parenRightPos ??= end !== void 0 ? { start: end, end: end + 1 } : void 0;
   node.bracket.left = token(TOKEN_TYPE.BRACKETL, "[", parenLeftPos);
-  if (bracket == null ? void 0 : bracket.right) {
+  if (bracket?.right) {
     node.bracket.right = token(TOKEN_TYPE.BRACKETR, "]", parenRightPos);
   } else {
     if (parenRightPos) {
@@ -20,8 +19,8 @@ function array(values, bracket = { right: true, left: true }, parenLeftPos, pare
     }
     node.bracket.right = token(TOKEN_TYPE.BRACKETR, void 0, parenRightPos);
   }
-  node.start = ((_c = node.bracket.left) == null ? void 0 : _c.start) ?? start ?? ((_d = node.bracket) == null ? void 0 : _d.right.start);
-  node.end = ((_f = (_e = node.bracket) == null ? void 0 : _e.right) == null ? void 0 : _f.end) ?? end ?? node.bracket.left.end;
+  node.start = node.bracket.left?.start ?? start ?? node.bracket?.right.start;
+  node.end = node.bracket?.right?.end ?? end ?? node.bracket.left.end;
   return createArrayNode(node);
 }
 export {

package/dist/ast/builders/condition.js

@@ -4,7 +4,7 @@ import { createConditionNode } from "../createConditionNode.js";
 function condition(value, not = true, property, propertyOperator, { right, left } = {}) {
   const position = pos(value);
   const notStart = not === true ? void 0 : not.start;
-  position.start = notStart ?? (property == null ? void 0 : property.start) ?? (propertyOperator == null ? void 0 : propertyOperator.start) ?? position.start;
+  position.start = notStart ?? property?.start ?? propertyOperator?.start ?? position.start;
   const node = {
     property,
     value,

package/dist/ast/builders/expression.js

@@ -3,15 +3,15 @@ import { token } from "./token.js";
 import { TOKEN_TYPE } from "../../types/ast.js";
 import { createExpressionNode } from "../createExpressionNode.js";
 function expression(left, operator, right) {
-  const start = (left == null ? void 0 : left.start) ?? (operator == null ? void 0 : operator.start) ?? (right == null ? void 0 : right.start);
-  const end = (right == null ? void 0 : right.end) ?? (operator == null ? void 0 : operator.end) ?? (left == null ? void 0 : left.end);
+  const start = left?.start ?? operator?.start ?? right?.start;
+  const end = right?.end ?? operator?.end ?? left?.end;
   const position = pos({ start, end });
-  left ?? (left = token(TOKEN_TYPE.VALUE, void 0, { start: position.start }));
+  left ??= token(TOKEN_TYPE.VALUE, void 0, { start: position.start });
   let op;
   if (operator === void 0) {
     operator = token([TOKEN_TYPE.AND, TOKEN_TYPE.OR], void 0, { start: left.end });
   } else op = operator;
-  right ?? (right = token(TOKEN_TYPE.VALUE, void 0, { start: op.end }));
+  right ??= token(TOKEN_TYPE.VALUE, void 0, { start: op.end });
   return createExpressionNode({
     left,
     operator: op,

package/dist/ast/builders/group.js

@@ -2,15 +2,14 @@ import { token } from "./token.js";
 import { TOKEN_TYPE } from "../../types/ast.js";
 import { createGroupNode } from "../createGroupNode.js";
 function group(prefix, expression, paren = { right: true, left: true }, parenLeftPos, parenRightPos) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
-  expression ?? (expression = token(TOKEN_TYPE.VALUE, void 0, (prefix == null ? void 0 : prefix.end) !== void 0 ? { start: prefix.end } : void 0));
+  expression ??= token(TOKEN_TYPE.VALUE, void 0, prefix?.end !== void 0 ? { start: prefix.end } : void 0);
   const node = {
     prefix: void 0,
     expression
   };
   if (prefix) {
     node.prefix = prefix;
-    const locToRight = ((_b = (_a = node.paren) == null ? void 0 : _a.left) == null ? void 0 : _b.start) ?? ((_c = node.expression) == null ? void 0 : _c.start) ?? ((_d = node.paren) == null ? void 0 : _d.right.start);
+    const locToRight = node.paren?.left?.start ?? node.expression?.start ?? node.paren?.right.start;
     if (prefix.start === void 0 && locToRight !== void 0) {
       throw new Error("group builder: missing prefix location when passed expression with location");
     }
@@ -18,9 +17,9 @@ function group(prefix, expression, paren = { right: true, left: true }, parenLef
   node.paren = {};
   const start = expression.start;
   const end = expression.end;
-  parenLeftPos ?? (parenLeftPos = start !== void 0 ? { start: start - 1, end: start } : void 0);
-  parenRightPos ?? (parenRightPos = end !== void 0 ? { start: end, end: end + 1 } : void 0);
-  if (paren == null ? void 0 : paren.left) {
+  parenLeftPos ??= start !== void 0 ? { start: start - 1, end: start } : void 0;
+  parenRightPos ??= end !== void 0 ? { start: end, end: end + 1 } : void 0;
+  if (paren?.left) {
     node.paren.left = token(TOKEN_TYPE.PARENL, "(", parenLeftPos);
   } else {
     if (parenLeftPos) {
@@ -28,7 +27,7 @@ function group(prefix, expression, paren = { right: true, left: true }, parenLef
     }
     node.paren.left = token(TOKEN_TYPE.PARENL, void 0, parenLeftPos);
   }
-  if (paren == null ? void 0 : paren.right) {
+  if (paren?.right) {
     node.paren.right = token(TOKEN_TYPE.PARENR, ")", parenRightPos);
   } else {
     if (parenRightPos) {
@@ -36,8 +35,8 @@ function group(prefix, expression, paren = { right: true, left: true }, parenLef
     }
     node.paren.right = token(TOKEN_TYPE.PARENR, void 0, parenRightPos);
   }
-  node.start = ((_e = node.prefix) == null ? void 0 : _e.start) ?? ((_g = (_f = node.paren) == null ? void 0 : _f.left) == null ? void 0 : _g.start) ?? ((_h = node.expression) == null ? void 0 : _h.start) ?? ((_i = node.paren) == null ? void 0 : _i.right.start);
-  node.end = ((_k = (_j = node.paren) == null ? void 0 : _j.right) == null ? void 0 : _k.end) ?? ((_l = node.expression) == null ? void 0 : _l.end) ?? ((_m = node.paren) == null ? void 0 : _m.left.end) ?? ((_n = node.prefix) == null ? void 0 : _n.end);
+  node.start = node.prefix?.start ?? node.paren?.left?.start ?? node.expression?.start ?? node.paren?.right.start;
+  node.end = node.paren?.right?.end ?? node.expression?.end ?? node.paren?.left.end ?? node.prefix?.end;
   return createGroupNode(node);
 }
 export {

package/dist/ast/builders/token.js

@@ -1,4 +1,4 @@
-import { isArray } from "@alanscodelog/utils/isArray.js";
+import { isArray } from "@alanscodelog/utils/isArray";
 import { pos } from "./pos.js";
 import { createToken } from "../createToken.js";
 function token(type, value, position = {}) {

package/dist/ast/builders/variable.js

@@ -3,7 +3,6 @@ import { token } from "./token.js";
 import { TOKEN_TYPE } from "../../types/ast.js";
 import { createVariableNode } from "../createVariableNode.js";
 function variable(prefix, value, quote, position) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   if (typeof value === "string") {
     value = token(TOKEN_TYPE.VALUE, value, position);
   }
@@ -14,14 +13,14 @@ function variable(prefix, value, quote, position) {
   };
   if (quote) {
     node.quote = {};
-    const quoteLeftPos = (position == null ? void 0 : position.start) !== void 0 ? pos({ start: position.start }, { fill: true }) : void 0;
+    const quoteLeftPos = position?.start !== void 0 ? pos({ start: position.start }, { fill: true }) : void 0;
     if (quote.left) {
       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;
+    const quoteRightPos = position?.end !== void 0 ? pos({ end: position.end }, { fill: true }) : void 0;
     if (quote.right) {
       if (quoteRightPos) quoteRightPos.end += 1;
       node.quote.right = token(quote.type, quoteFromType(quote.type), quoteRightPos);
@@ -32,12 +31,12 @@ function variable(prefix, value, quote, position) {
       const start = node.quote.right.end;
       node.quote.flags = token(TOKEN_TYPE.VALUE, quote.flags, {
         start,
-        end: start + ((_a = quote.flags) == null ? void 0 : _a.length)
+        end: start + quote.flags?.length
       });
     }
   }
-  node.start = ((_b = node.prefix) == null ? void 0 : _b.start) ?? ((_c = node.quote) == null ? void 0 : _c.left.start) ?? ((_d = node.value) == null ? void 0 : _d.start) ?? ((_e = node.quote) == null ? void 0 : _e.right.start);
-  node.end = ((_g = (_f = node.quote) == null ? void 0 : _f.flags) == null ? void 0 : _g.end) ?? ((_h = node.quote) == null ? void 0 : _h.right.end) ?? ((_i = node.value) == null ? void 0 : _i.end) ?? ((_j = node.quote) == null ? void 0 : _j.left.end);
+  node.start = node.prefix?.start ?? node.quote?.left.start ?? node.value?.start ?? node.quote?.right.start;
+  node.end = node.quote?.flags?.end ?? node.quote?.right.end ?? node.value?.end ?? node.quote?.left.end;
   return createVariableNode(node);
 }
 function quoteFromType(type) {

package/dist/ast/createConditionNode.js

@@ -1,8 +1,7 @@
 import { AST_TYPE } from "../types/ast.js";
 import { isNode } from "../utils/isNode.js";
 function createConditionNode(raw) {
-  var _a, _b, _c, _d, _e;
-  const valid = (raw.operator === void 0 || ((_a = raw.operator) == null ? void 0 : _a.valid)) && isNode(raw.value) && raw.value.valid && (raw.property === void 0 && raw.propertyOperator === void 0 && raw.sep === void 0 || raw.property !== void 0 && "type" in raw.property && raw.property.type === AST_TYPE.VARIABLE && (((_b = raw.propertyOperator) == null ? void 0 : _b.valid) === true || ((_d = (_c = raw.sep) == null ? void 0 : _c.left) == null ? void 0 : _d.valid) === true && (raw.sep.right === void 0 || ((_e = raw.sep) == null ? void 0 : _e.right.valid))));
+  const valid = (raw.operator === void 0 || raw.operator?.valid) && isNode(raw.value) && raw.value.valid && (raw.property === void 0 && raw.propertyOperator === void 0 && raw.sep === void 0 || raw.property !== void 0 && "type" in raw.property && raw.property.type === AST_TYPE.VARIABLE && (raw.propertyOperator?.valid === true || raw.sep?.left?.valid === true && (raw.sep.right === void 0 || raw.sep?.right.valid)));
   return {
     property: void 0,
     propertyOperator: void 0,

package/dist/ast/handlers.js

@@ -43,12 +43,11 @@ const operator = {
   not: operators(TOKEN_TYPE.NOT)
 };
 function variable(prefix, quoteL, value, quoteR, flags) {
-  var _a, _b;
   const node = {
     prefix: prefix ?? void 0,
-    value: value ?? error((prefix == null ? void 0 : prefix.end) ?? (quoteL == null ? void 0 : quoteL.end) ?? (quoteR == null ? void 0 : quoteR.start), [TOKEN_TYPE.VALUE]),
-    start: (prefix == null ? void 0 : prefix.start) ?? (quoteL == null ? void 0 : quoteL.start) ?? (value == null ? void 0 : value.start) ?? (quoteR == null ? void 0 : quoteR.start),
-    end: (quoteR == null ? void 0 : quoteR.end) ?? (value == null ? void 0 : value.end) ?? (quoteL == null ? void 0 : quoteL.end) ?? (prefix == null ? void 0 : prefix.end)
+    value: value ?? error(prefix?.end ?? quoteL?.end ?? quoteR?.start, [TOKEN_TYPE.VALUE]),
+    start: prefix?.start ?? quoteL?.start ?? value?.start ?? quoteR?.start,
+    end: quoteR?.end ?? value?.end ?? quoteL?.end ?? prefix?.end
   };
   if (quoteL || quoteR) {
     node.quote = {
@@ -57,15 +56,14 @@ function variable(prefix, quoteL, value, quoteR, flags) {
     };
     if (flags) {
       node.quote.flags = flags;
-      node.end = ((_b = (_a = node.quote) == null ? void 0 : _a.flags) == null ? void 0 : _b.end) ?? node.end;
+      node.end = node.quote?.flags?.end ?? node.end;
     }
   }
   return createVariableNode(node);
 }
 function condition(not, property, { propertyOperator, sepL, sepR } = {}, value) {
-  var _a;
-  const start = (not == null ? void 0 : not.start) ?? (property == null ? void 0 : property.start) ?? (sepL == null ? void 0 : sepL.start) ?? (propertyOperator == null ? void 0 : propertyOperator.start) ?? (sepR == null ? void 0 : sepR.start) ?? (value == null ? void 0 : value.start);
-  const end = (value == null ? void 0 : value.end) ?? (sepR == null ? void 0 : sepR.end) ?? (propertyOperator == null ? void 0 : propertyOperator.end) ?? (sepL == null ? void 0 : sepL.end) ?? (property == null ? void 0 : property.end) ?? (not == null ? void 0 : not.end);
+  const start = not?.start ?? property?.start ?? sepL?.start ?? propertyOperator?.start ?? sepR?.start ?? value?.start;
+  const end = value?.end ?? sepR?.end ?? propertyOperator?.end ?? sepL?.end ?? property?.end ?? not?.end;
   const node = {
     value: value ?? error(end, [TOKEN_TYPE.VALUE]),
     start,
@@ -80,50 +78,49 @@ function condition(not, property, { propertyOperator, sepL, sepR } = {}, value)
     node.sep = {};
     if (sepL) {
       node.sep.left = sepL;
-      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]));
+      node.property ??= error(sepL.start, [TOKEN_TYPE.VALUE]);
+      node.propertyOperator ??= error(sepL?.end ?? sepR?.start, [TOKEN_TYPE.VALUE]);
     }
     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]);
+      node.sep.right = error(node.value?.start ?? end, [TOKEN_TYPE.OP_EXPANDED_SEP]);
     }
   } else if (propertyOperator) {
-    node.property ?? (node.property = error(propertyOperator.start, [TOKEN_TYPE.VALUE]));
+    node.property ??= error(propertyOperator.start, [TOKEN_TYPE.VALUE]);
   }
   return createConditionNode(node);
 }
 function expression(left, operator2, right) {
   return createExpressionNode({
-    left: left ?? error((operator2 == null ? void 0 : operator2.start) ?? (right == null ? void 0 : right.start), [TOKEN_TYPE.VALUE]),
-    operator: operator2 ?? error((left == null ? void 0 : left.end) ?? (right == null ? void 0 : right.start), [TOKEN_TYPE.AND, TOKEN_TYPE.OR]),
-    right: right ?? error((operator2 == null ? void 0 : operator2.end) ?? (left == null ? void 0 : left.end), [TOKEN_TYPE.VALUE]),
-    start: (left == null ? void 0 : left.start) ?? (operator2 == null ? void 0 : operator2.start) ?? (right == null ? void 0 : right.start),
-    end: (right == null ? void 0 : right.end) ?? (operator2 == null ? void 0 : operator2.end) ?? (left == null ? void 0 : left.end)
+    left: left ?? error(operator2?.start ?? right?.start, [TOKEN_TYPE.VALUE]),
+    operator: operator2 ?? error(left?.end ?? right?.start, [TOKEN_TYPE.AND, TOKEN_TYPE.OR]),
+    right: right ?? error(operator2?.end ?? left?.end, [TOKEN_TYPE.VALUE]),
+    start: left?.start ?? operator2?.start ?? right?.start,
+    end: right?.end ?? operator2?.end ?? left?.end
   });
 }
 function group(operator2, prefix, parenL, condition2, parenR) {
   return createGroupNode({
     prefix: prefix ?? operator2 ?? void 0,
-    expression: condition2 ?? error((parenL == null ? void 0 : parenL.end) ?? (parenR == null ? void 0 : parenR.start), [TOKEN_TYPE.VALUE]),
+    expression: condition2 ?? error(parenL?.end ?? parenR?.start, [TOKEN_TYPE.VALUE]),
     paren: {
-      left: parenL ?? error((prefix == null ? void 0 : prefix.end) ?? (operator2 == null ? void 0 : operator2.end) ?? (condition2 == null ? void 0 : condition2.start) ?? (parenR == null ? void 0 : parenR.start), [TOKEN_TYPE.PARENL]),
-      right: parenR ?? error((condition2 == null ? void 0 : condition2.end) ?? (parenL == null ? void 0 : parenL.end), [TOKEN_TYPE.PARENR])
+      left: parenL ?? error(prefix?.end ?? operator2?.end ?? condition2?.start ?? parenR?.start, [TOKEN_TYPE.PARENL]),
+      right: parenR ?? error(condition2?.end ?? parenL?.end, [TOKEN_TYPE.PARENR])
     },
-    start: (prefix == null ? void 0 : prefix.start) ?? (operator2 == null ? void 0 : operator2.start) ?? (parenL == null ? void 0 : parenL.start) ?? (condition2 == null ? void 0 : condition2.start) ?? (parenR == null ? void 0 : parenR.start),
-    end: (parenR == null ? void 0 : parenR.end) ?? (condition2 == null ? void 0 : condition2.end) ?? (parenL == null ? void 0 : parenL.end) ?? (operator2 == null ? void 0 : operator2.end) ?? (prefix == null ? void 0 : prefix.end)
+    start: prefix?.start ?? operator2?.start ?? parenL?.start ?? condition2?.start ?? parenR?.start,
+    end: parenR?.end ?? condition2?.end ?? parenL?.end ?? operator2?.end ?? prefix?.end
   });
 }
 function array(bracketL, values, bracketR) {
-  var _a, _b;
   return createArrayNode({
     values,
     bracket: {
       left: bracketL,
       // always valid for now
-      right: bracketR ?? error(((_a = values[values.length - 1]) == null ? void 0 : _a.end) ?? (bracketL == null ? void 0 : bracketL.end), [TOKEN_TYPE.BRACKETR])
+      right: bracketR ?? error(values[values.length - 1]?.end ?? bracketL?.end, [TOKEN_TYPE.BRACKETR])
     },
     start: bracketL.start,
-    end: (bracketR == null ? void 0 : bracketR.end) ?? ((_b = values[values.length - 1]) == null ? void 0 : _b.end) ?? bracketL.end
+    end: bracketR?.end ?? values[values.length - 1]?.end ?? bracketL.end
   });
 }
 export {

package/dist/examples/ParserWithSqlSupport.js

@@ -1,10 +1,11 @@
-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);
-import { unreachable } from "@alanscodelog/utils/unreachable.js";
+import { unreachable } from "@alanscodelog/utils/unreachable";
 import { Parser } from "../Parser.js";
 import { AST_TYPE, TOKEN_TYPE } from "../types/ast.js";
 class ParserWithSqlSupport extends Parser {
+  sqlEscapeValue;
+  operatorMap;
+  propertyDefinitions;
+  operatorDefinitions;
   constructor(propertyDefinitions, operatorDefinitions, { sqlEscapeValue }) {
     const operators = [];
     const operatorMap = {};
@@ -31,7 +32,6 @@ class ParserWithSqlSupport extends Parser {
       customPropertyOperators: operators,
       prefixableGroups: false,
       valueComparer: (condition, contextValue, _context) => {
-        var _a;
         if (typeof condition.value !== typeof contextValue) {
           throw new Error(`Expected type of property ${condition.property[0]} to be the same type as the context value ${contextValue} (${typeof contextValue}). If the ast has been validated this is likely because the type of the context value is incorrect.`);
         }
@@ -40,13 +40,12 @@ class ParserWithSqlSupport extends Parser {
         const propDefinition = propertyDefinitions[prop];
         const operatorDefinition = condition.operator && operatorDefinitions[condition.operator];
         if (!operatorDefinition) unreachable("Did you validate the ast before evaluating it?");
-        const isSupported = !((_a = propDefinition.supportedOperators) == null ? void 0 : _a.includes(condition.operator));
+        const isSupported = !propDefinition.supportedOperators?.includes(condition.operator);
         if (!isSupported) unreachable("Did you validate the ast before evaluating it?");
         const res = operatorDefinition.valueComparer(condition, contextValue);
         return res;
       },
       valueValidator: (_contextValue, query) => {
-        var _a, _b, _c;
         const prop = query.propertyKeys[0];
         let tokens = [];
         const propDefinition = propertyDefinitions[prop];
@@ -62,12 +61,12 @@ class ParserWithSqlSupport extends Parser {
         const opKey = op && operatorMap[op.value];
         if (!op || !opKey) {
           tokens.push({
-            start: (_a = op ?? query.condition) == null ? void 0 : _a.start,
-            end: (_b = op ?? query.condition) == null ? void 0 : _b.end,
+            start: (op ?? query.condition)?.start,
+            end: (op ?? query.condition)?.end,
             type: "unknownOperator"
           });
         } else {
-          if (propDefinition.supportedOperators && !((_c = propDefinition.supportedOperators) == null ? void 0 : _c.includes(opKey))) {
+          if (propDefinition.supportedOperators && !propDefinition.supportedOperators?.includes(opKey)) {
             tokens.push({
               start: query.condition.start,
               end: query.condition.end,
@@ -94,7 +93,7 @@ class ParserWithSqlSupport extends Parser {
           if (tokens.length > 0) return tokens;
           return;
         }
-        if ((val == null ? void 0 : val.type) !== "VARIABLE") unreachable();
+        if (val?.type !== "VARIABLE") unreachable();
         const value = val.value.value;
         const res = convertAndValidateValue(query.isQuoted, value, prop, propertyDefinitions);
         if (res instanceof Error) {
@@ -110,8 +109,7 @@ class ParserWithSqlSupport extends Parser {
         if (tokens.length > 0) return tokens;
       },
       conditionNormalizer(query) {
-        var _a, _b;
-        const prop = (_a = query.property) == null ? void 0 : _a[0];
+        const prop = query.property?.[0];
         if (!prop) unreachable("Did you validate the ast before normalizing it?");
         const propDefinition = propertyDefinitions[prop];
         let finalValue;
@@ -140,7 +138,7 @@ class ParserWithSqlSupport extends Parser {
         if (!opKey) unreachable("Did you validate the ast before normalizing it?");
         const operatorDefinition = opKey && operatorDefinitions[opKey];
         if (!operatorDefinition) unreachable("Did you validate the ast before normalizing it?");
-        const isNegatableOperator = (_b = operatorDefinition.negatedOperators) == null ? void 0 : _b.includes(query.operator);
+        const isNegatableOperator = operatorDefinition.negatedOperators?.includes(query.operator);
         finalOperator = operatorDefinition.operator;
         let isNegated = query.isNegated;
         if (isNegatableOperator) {
@@ -149,30 +147,25 @@ class ParserWithSqlSupport extends Parser {
         return { value: finalValue, operator: finalOperator, negate: isNegated };
       }
     });
-    __publicField(this, "sqlEscapeValue");
-    __publicField(this, "operatorMap");
-    __publicField(this, "propertyDefinitions");
-    __publicField(this, "operatorDefinitions");
     this.propertyDefinitions = propertyDefinitions;
     this.operatorDefinitions = operatorDefinitions;
     this.operatorMap = operatorMap;
     this.sqlEscapeValue = sqlEscapeValue;
   }
   toSql(ast, wrapStrings) {
-    var _a, _b;
     this._checkEvaluationOptions();
     const chunks = [];
     if (ast.type === AST_TYPE.NORMALIZED_CONDITION) {
-      const prop = (_a = ast.property) == null ? void 0 : _a[0];
+      const prop = ast.property?.[0];
       const definition = this.propertyDefinitions[prop];
       const value = ast.value;
-      const col = ((_b = definition.transformToColumn) == null ? void 0 : _b.call(definition, prop, definition.name)) ?? `"${prop}"`;
+      const col = definition.transformToColumn?.(prop, definition.name) ?? `"${prop}"`;
       const op = ast.operator;
       if (ast.negate) {
-        chunks.push((wrapStrings == null ? void 0 : wrapStrings(`NOT(`)) ?? `NOT(`);
+        chunks.push(wrapStrings?.(`NOT(`) ?? `NOT(`);
       }
-      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`${col} `)) ?? `${col} `);
-      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`${op} `)) ?? `${op} `);
+      chunks.push(wrapStrings?.(`${col} `) ?? `${col} `);
+      chunks.push(wrapStrings?.(`${op} `) ?? `${op} `);
       const val = this.sqlEscapeValue(value);
       if (definition.transformValue) {
         const transformed = definition.transformValue(val, value);
@@ -185,7 +178,7 @@ class ParserWithSqlSupport extends Parser {
         chunks.push(val);
       }
       if (ast.negate) {
-        chunks.push((wrapStrings == null ? void 0 : wrapStrings(`)`)) ?? `)`);
+        chunks.push(wrapStrings?.(`)`) ?? `)`);
       }
       return chunks;
     }
@@ -193,11 +186,11 @@ class ParserWithSqlSupport extends Parser {
       const left = this.toSql(ast.left, wrapStrings);
       const right = this.toSql(ast.right, wrapStrings);
       const op = ast.operator === TOKEN_TYPE.AND ? "AND" : "OR";
-      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`(`)) ?? `(`);
+      chunks.push(wrapStrings?.(`(`) ?? `(`);
       chunks.push(...left);
-      chunks.push((wrapStrings == null ? void 0 : wrapStrings(` ${op} `)) ?? ` ${op} `);
+      chunks.push(wrapStrings?.(` ${op} `) ?? ` ${op} `);
       chunks.push(...right);
-      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`)`)) ?? `)`);
+      chunks.push(wrapStrings?.(`)`) ?? `)`);
       return chunks;
     }
     return unreachable();
@@ -210,7 +203,6 @@ function createTypeError(prop, type, isArray) {
   return new Error(`Property ${prop} must be of type ${type}.`);
 }
 function convertAndValidateValue(isQuoted, value, prop, propertyDefinitions, { isArray = false } = {}) {
-  var _a;
   let finalValue = value;
   let isFloat = false;
   const propDefinition = propertyDefinitions[prop];
@@ -233,7 +225,7 @@ function convertAndValidateValue(isQuoted, value, prop, propertyDefinitions, { i
     }
   }
   const type = propDefinition.type;
-  finalValue = ((_a = propDefinition.postParse) == null ? void 0 : _a.call(propDefinition, finalValue)) ?? finalValue;
+  finalValue = propDefinition.postParse?.(finalValue) ?? finalValue;
   switch (type) {
     case "integer":
     case "float": {

package/dist/examples/ShortcutContextParser.js

@@ -1,8 +1,7 @@
-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);
 import { Parser } from "../Parser.js";
 class ShortcutContextParser extends Parser {
+  validKeys = [];
+  regexablekeys = [];
   constructor(dummyContext, validRegexFlags = ["i", "u", "m"]) {
     super({
       arrayValues: false,
@@ -97,8 +96,6 @@ class ShortcutContextParser extends Parser {
         return { value: finalValue, operator: finalOperator, negate: isNegated };
       }
     });
-    __publicField(this, "validKeys", []);
-    __publicField(this, "regexablekeys", []);
     this._extractKeysFromContext(dummyContext);
   }
   setContext(context) {

package/dist/internal/ExpressitError.js

@@ -1,12 +1,13 @@
-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);
-import { crop } from "@alanscodelog/utils/crop.js";
-import { indent } from "@alanscodelog/utils/indent.js";
-import { pretty } from "@alanscodelog/utils/pretty.js";
+import { crop } from "@alanscodelog/utils/crop";
+import { indent } from "@alanscodelog/utils/indent";
+import { pretty } from "@alanscodelog/utils/pretty";
 import packageJson from "../package.json.js";
 const { version, repository } = packageJson;
 class ExpressitError extends Error {
+  version = version;
+  repo = repository;
+  type;
+  info;
   constructor(type, info, message) {
     super(
       message ? `${message}
@@ -17,10 +18,6 @@ ${crop`
 					info: ${indent(JSON.stringify(info, forceStringifyErrors, "	"), 5)}
 				`}`
     );
-    __publicField(this, "version", version);
-    __publicField(this, "repo", repository);
-    __publicField(this, "type");
-    __publicField(this, "info");
     this.type = type;
     this.info = info;
   }

package/dist/internal/checkParserOpts.js

@@ -1,11 +1,10 @@
-import { isBlank } from "@alanscodelog/utils/isBlank.js";
-import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn.js";
+import { isBlank } from "@alanscodelog/utils/isBlank";
+import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn";
 import { ExpressitError } from "./ExpressitError.js";
 import { defaultConditionNormalizer } from "../defaults/defaultConditionNormalizer.js";
 import { defaultValueComparer } from "../defaults/defaultValueComparer.js";
 import { PARSER_ERROR } from "../types/errors.js";
 function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   if (!evaluatorChecks) {
     const keywordsList = [...opts.keywords.and, ...opts.keywords.or, ...opts.keywords.not].map((keyword) => keyword.value);
     const symNots = opts.keywords.not.filter((op) => op.isSymbol).map((op) => op.value);
@@ -25,7 +24,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
         `expandedPropertySeparator cannot be blank`
       );
     }
-    const customInvalid = (_a = opts.customPropertyOperators) == null ? void 0 : _a.find((_) => isBlank(_));
+    const customInvalid = opts.customPropertyOperators?.find((_) => isBlank(_));
     if (customInvalid !== void 0) {
       throw new ExpressitError(
         PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
@@ -33,7 +32,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
         `customPropertyOperators cannot contain blank entries`
       );
     }
-    const prefixInvalid = (_b = opts.prefixableStrings) == null ? void 0 : _b.find((_) => isBlank(_));
+    const prefixInvalid = opts.prefixableStrings?.find((_) => isBlank(_));
     if (prefixInvalid !== void 0) {
       throw new ExpressitError(
         PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
@@ -42,7 +41,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
       );
     }
     for (const key of ["and", "or", "not"]) {
-      const invalid = (_d = (_c = opts.keywords[key]) == null ? void 0 : _c.find((_) => isBlank(_.value))) == null ? void 0 : _d.value;
+      const invalid = opts.keywords[key]?.find((_) => isBlank(_.value))?.value;
       if (invalid !== void 0) {
         throw new ExpressitError(
           PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
@@ -55,7 +54,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     const allKeywords = [...keywords, ...symNots];
     const messageInvalidAny = "cannot contain operators or special symbols, but found";
     const messageInvalidBool = "cannot contain boolean operators or special symbols, but found";
-    const invalidPrefixableString = (_e = opts.prefixableStrings) == null ? void 0 : _e.find((val) => all.includes(val));
+    const invalidPrefixableString = opts.prefixableStrings?.find((val) => all.includes(val));
     if (invalidPrefixableString) {
       throw new ExpressitError(
         PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
@@ -71,7 +70,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
         `expandedPropertySeparator ${messageInvalidBool} "${invalidExpandedPropertySeparator}"`
       );
     }
-    const invalidCustomPropertyOperator = ((_f = opts.customPropertyOperators) == null ? void 0 : _f.find((val) => keywords.includes(val))) ? opts.expandedPropertySeparator : void 0;
+    const invalidCustomPropertyOperator = opts.customPropertyOperators?.find((val) => keywords.includes(val)) ? opts.expandedPropertySeparator : void 0;
     if (invalidCustomPropertyOperator) {
       throw new ExpressitError(
         PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
@@ -82,9 +81,9 @@ 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.prefixableStrings?.length ?? 0) > 0) requireCustomNormalizer.push("prefixableStrings");
+    if ((opts.customPropertyOperators?.length ?? 0) > 0) requireCustomNormalizer.push("customPropertyOperators");
+    if ((opts.expandedPropertySeparator?.length ?? 0) > 0) requireCustomNormalizer.push("expandedPropertySeparator");
     if (opts.regexValues) requireCustomNormalizer.push("regexValues");
     if (requireCustomNormalizer.length > 0 && opts.conditionNormalizer === defaultConditionNormalizer) {
       throw new ExpressitError(

package/dist/internal/escapeVariableOrPrefix.js

@@ -1,4 +1,4 @@
-import { multisplice } from "@alanscodelog/utils/multisplice.js";
+import { multisplice } from "@alanscodelog/utils/multisplice";
 function escapeVariableOrPrefix(variable, preferredQuote) {
   let doQuote = false;
   for (const quoteType of ['"', "'", "`"]) {

package/dist/internal/parseParserOptions.js

@@ -3,7 +3,6 @@ import { defaultKeyParser } from "../defaults/defaultKeyParser.js";
 import { defaultPrefixApplier } from "../defaults/defaultPrefixApplier.js";
 import { defaultValueComparer } from "../defaults/defaultValueComparer.js";
 function parseParserOptions(options) {
-  var _a, _b, _c;
   const opts = {
     prefixApplier: defaultPrefixApplier,
     keyParser: defaultKeyParser,
@@ -19,19 +18,19 @@ function parseParserOptions(options) {
     ...options,
     // todo fix
     keywords: {
-      or: ((_a = options.keywords) == null ? void 0 : _a.or) ? options.keywords.or : [
+      or: options.keywords?.or ? options.keywords.or : [
         { value: "||", isSymbol: true },
         { value: "|", isSymbol: true },
         { value: "or", isSymbol: false },
         { value: "OR", isSymbol: false }
       ],
-      and: ((_b = options.keywords) == null ? void 0 : _b.and) ? options.keywords.and : [
+      and: options.keywords?.and ? options.keywords.and : [
         { value: "&&", isSymbol: true },
         { value: "&", isSymbol: true },
         { value: "and", isSymbol: false },
         { value: "AND", isSymbol: false }
       ],
-      not: ((_c = options.keywords) == null ? void 0 : _c.not) ? options.keywords.not : [
+      not: options.keywords?.not ? options.keywords.not : [
         { value: "!", isSymbol: true },
         { value: "not", isSymbol: false },
         { value: "NOT", isSymbol: false }

package/dist/package.json.js

@@ -1,4 +1,4 @@
-const version = "0.3.0";
+const version = "0.4.0";
 const repository = "https://github.com/witchcraftjs/expressit";
 const packageJson = {
   version,

package/dist/types/ast.js

@@ -1,4 +1,4 @@
-import { enumFromArray } from "@alanscodelog/utils/enumFromArray.js";
+import { enumFromArray } from "@alanscodelog/utils/enumFromArray";
 const TOKEN_TYPE = enumFromArray([
   "VALUE",
   "AND",

package/dist/types/autocomplete.js

@@ -1,5 +1,5 @@
 import "@alanscodelog/utils";
-import { enumFromArray } from "@alanscodelog/utils/enumFromArray.js";
+import { enumFromArray } from "@alanscodelog/utils/enumFromArray";
 const SUGGESTION_TYPE = enumFromArray([
   "VARIABLE",
   "ARRAY_VALUE",