@witchcraft/expressit 0.1.2 → 0.2.0

package/dist/ast/handlers.js

@@ -1,26 +1,25 @@
-import { ArrayNode } from "./classes/ArrayNode.js";
-import { ConditionNode } from "./classes/ConditionNode.js";
-import { ErrorToken } from "./classes/ErrorToken.js";
-import { ExpressionNode } from "./classes/ExpressionNode.js";
-import { GroupNode } from "./classes/GroupNode.js";
-import { ValidToken } from "./classes/ValidToken.js";
-import { VariableNode } from "./classes/VariableNode.js";
-import { TOKEN_TYPE } from "../types/ast.js";
+import { createArrayNode } from "./createArrayNode.js";
+import { createConditionNode } from "./createConditionNode.js";
+import { createExpressionNode } from "./createExpressionNode.js";
+import { createGroupNode } from "./createGroupNode.js";
+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");
-  return new ErrorToken({ expected, start: pos, end: pos });
+  return createToken({ expected, start: pos, end: pos });
 }
-const operators = (type) => (value, pos) => new ValidToken({ value, type, ...pos });
+const operators = (type) => (value, pos) => createToken({ value, type, ...pos });
 const delimiters = (type) => (value, pos) => (
   // check must be falsy, we want to return undefined when given ""
-  value ? new ValidToken({ value, type, ...pos }) : void 0
+  value ? createToken({ value, type, ...pos }) : void 0
 );
 const maybeToken = (type) => (value, pos) => {
   if (value === void 0) {
     return error(pos.end, [type]);
   } else {
-    return new ValidToken({ value, type, ...pos });
+    return createToken({ value, type, ...pos });
   }
 };
 const token = {
@@ -45,7 +44,7 @@ const operator = {
   not: operators(TOKEN_TYPE.NOT)
 };
 function variable(prefix, quoteL, value, quoteR, flags) {
-  var _a;
+  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]),
@@ -59,11 +58,10 @@ function variable(prefix, quoteL, value, quoteR, flags) {
     };
     if (flags) {
       node.quote.flags = flags;
-      node.end = (_a = node.quote) == null ? void 0 : _a.flags.end;
+      node.end = ((_b = (_a = node.quote) == null ? void 0 : _a.flags) == null ? void 0 : _b.end) ?? node.end;
     }
   }
-  const instance = new VariableNode(node);
-  return instance;
+  return createVariableNode(node);
 }
 function condition(not, property, { propertyOperator, sepL, sepR } = {}, value) {
   var _a;
@@ -90,27 +88,25 @@ function condition(not, property, { propertyOperator, sepL, sepR } = {}, value)
     }
     if (sepR)
       node.sep.right = sepR;
-    else if (!node.value || node.value instanceof VariableNode) {
+    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]);
     }
   } else if (propertyOperator) {
     node.property || (node.property = error(propertyOperator.start, [TOKEN_TYPE.VALUE]));
   }
-  const instance = new ConditionNode(node);
-  return instance;
+  return createConditionNode(node);
 }
 function expression(left, operator2, right) {
-  const instance = new ExpressionNode({
+  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)
   });
-  return instance;
 }
 function group(operator2, prefix, parenL, condition2, parenR) {
-  const node = {
+  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]),
     paren: {
@@ -119,13 +115,11 @@ function group(operator2, prefix, parenL, condition2, 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)
-  };
-  const instance = new GroupNode(node);
-  return instance;
+  });
 }
 function array(bracketL, values, bracketR) {
   var _a, _b;
-  const node = {
+  return createArrayNode({
     values,
     bracket: {
       left: bracketL,
@@ -134,9 +128,7 @@ function array(bracketL, values, bracketR) {
     },
     start: bracketL.start,
     end: (bracketR == null ? void 0 : bracketR.end) ?? ((_b = values[values.length - 1]) == null ? void 0 : _b.end) ?? bracketL.end
-  };
-  const instance = new ArrayNode(node);
-  return instance;
+  });
 }
 export {
   array,

package/dist/ast/index.d.ts

@@ -1,4 +1,12 @@
 export * as builders from "./builders/index.js";
-export * as classes from "./classes/index.js";
+export { createArrayNode } from "./createArrayNode.js";
+export { createCondition } from "./createNormalizedCondition.js";
+export { createConditionNode } from "./createConditionNode.js";
+export { createExpression } from "./createNormalizedExpression.js";
+export { createExpressionNode } from "./createExpressionNode.js";
+export { createGroupNode } from "./createGroupNode.js";
+export { createToken } from "./createToken.js";
+export { createVariableNode } from "./createVariableNode.js";
+export { error } from "./error.js";
 export { token } from "./handlers.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/ast/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ast/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ast/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAG/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA"}

package/dist/ast/index.js

@@ -1,8 +1,24 @@
 import * as index from "./builders/index.js";
-import * as index$1 from "./classes/index.js";
+import { createArrayNode } from "./createArrayNode.js";
+import { createCondition } from "./createNormalizedCondition.js";
+import { createConditionNode } from "./createConditionNode.js";
+import { createExpression } from "./createNormalizedExpression.js";
+import { createExpressionNode } from "./createExpressionNode.js";
+import { createGroupNode } from "./createGroupNode.js";
+import { createToken } from "./createToken.js";
+import { createVariableNode } from "./createVariableNode.js";
+import { error } from "./error.js";
 import { token } from "./handlers.js";
 export {
   index as builders,
-  index$1 as classes,
+  createArrayNode,
+  createCondition,
+  createConditionNode,
+  createExpression,
+  createExpressionNode,
+  createGroupNode,
+  createToken,
+  createVariableNode,
+  error,
   token
 };

package/dist/defaults/defaultConditionNormalizer.d.ts

@@ -0,0 +1,3 @@
+import type { ConditionNormalizer } from "../types/parser.js";
+export declare const defaultConditionNormalizer: ConditionNormalizer;
+//# sourceMappingURL=defaultConditionNormalizer.d.ts.map

package/dist/defaults/defaultConditionNormalizer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultConditionNormalizer.d.ts","sourceRoot":"","sources":["../../src/defaults/defaultConditionNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAc,MAAM,oBAAoB,CAAA;AAGzE,eAAO,MAAM,0BAA0B,EAAE,mBAKxC,CAAA"}

package/dist/defaults/defaultKeyParser.d.ts

@@ -0,0 +1,3 @@
+import type { KeyParser } from "../types/parser.js";
+export declare const defaultKeyParser: KeyParser;
+//# sourceMappingURL=defaultKeyParser.d.ts.map

package/dist/defaults/defaultKeyParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultKeyParser.d.ts","sourceRoot":"","sources":["../../src/defaults/defaultKeyParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAGnD,eAAO,MAAM,gBAAgB,EAAE,SAI7B,CAAA"}

package/dist/defaults/defaultPrefixApplier.d.ts

@@ -0,0 +1,3 @@
+import type { PrefixApplier } from "../types/parser.js";
+export declare const defaultPrefixApplier: PrefixApplier;
+//# sourceMappingURL=defaultPrefixApplier.d.ts.map

package/dist/defaults/defaultPrefixApplier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultPrefixApplier.d.ts","sourceRoot":"","sources":["../../src/defaults/defaultPrefixApplier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGvD,eAAO,MAAM,oBAAoB,EAAE,aAGlC,CAAA"}

package/dist/defaults/defaultValueComparer.d.ts

@@ -0,0 +1,3 @@
+import type { ValueComparer } from "../types/parser.js";
+export declare const defaultValueComparer: ValueComparer;
+//# sourceMappingURL=defaultValueComparer.d.ts.map

package/dist/defaults/defaultValueComparer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultValueComparer.d.ts","sourceRoot":"","sources":["../../src/defaults/defaultValueComparer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGvD,eAAO,MAAM,oBAAoB,EAAE,aAGlC,CAAA"}

package/dist/{helpers/general → defaults}/index.d.ts

@@ -1,5 +1,3 @@
-export { applyBoolean } from "./applyBoolean.js";
-export { applyPrefix } from "./applyPrefix.js";
 export { defaultConditionNormalizer } from "./defaultConditionNormalizer.js";
 export { defaultKeyParser } from "./defaultKeyParser.js";
 export { defaultPrefixApplier } from "./defaultPrefixApplier.js";

package/dist/defaults/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/defaults/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA"}

package/dist/{helpers/general → defaults}/index.js

@@ -1,12 +1,8 @@
-import { applyBoolean } from "./applyBoolean.js";
-import { applyPrefix } from "./applyPrefix.js";
 import { defaultConditionNormalizer } from "./defaultConditionNormalizer.js";
 import { defaultKeyParser } from "./defaultKeyParser.js";
 import { defaultPrefixApplier } from "./defaultPrefixApplier.js";
 import { defaultValueComparer } from "./defaultValueComparer.js";
 export {
-  applyBoolean,
-  applyPrefix,
   defaultConditionNormalizer,
   defaultKeyParser,
   defaultPrefixApplier,

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-export * as ast from "./ast/classes/index.js";
+export * as ast from "./ast/index.js";
 export { Parser } from "./Parser.js";
 export * from "./types/index.js";
 export * as utils from "./utils/index.js";
+export * as defaults from "./defaults/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA"}

package/dist/index.js

@@ -1,9 +1,10 @@
-import * as index from "./ast/classes/index.js";
+import * as index from "./ast/index.js";
 import { Parser } from "./Parser.js";
 import { AST_TYPE, TOKEN_TYPE } from "./types/ast.js";
 import { SUGGESTION_TYPE } from "./types/autocomplete.js";
 import { ERROR_CODES } from "./types/errors.js";
 import * as index$1 from "./utils/index.js";
+import * as index$2 from "./defaults/index.js";
 export {
   AST_TYPE,
   ERROR_CODES,
@@ -11,5 +12,6 @@ export {
   SUGGESTION_TYPE,
   TOKEN_TYPE,
   index as ast,
+  index$2 as defaults,
   index$1 as utils
 };

package/dist/{helpers/errors.d.ts → internal/ExpressitError.d.ts}

@@ -1,9 +1,10 @@
 import type { ERROR_CODES, ErrorInfo } from "../types/errors.js";
-export declare class BooleanParserLibraryError<T extends ERROR_CODES> extends Error {
+/** @internal */
+export declare class ExpressitError<T extends ERROR_CODES> extends Error {
     version: string;
     repo: string;
     type: T;
     info: ErrorInfo<T>;
     constructor(type: T, info: ErrorInfo<T>, message?: string);
 }
-//# sourceMappingURL=errors.d.ts.map
+//# sourceMappingURL=ExpressitError.d.ts.map

package/dist/internal/ExpressitError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpressitError.d.ts","sourceRoot":"","sources":["../../src/internal/ExpressitError.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEhE,gBAAgB;AAChB,qBAAa,cAAc,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,KAAK;IAC/D,OAAO,EAAE,MAAM,CAAU;IAEzB,IAAI,EAAE,MAAM,CAAa;IAEzB,IAAI,EAAE,CAAC,CAAA;IAEP,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;gBAEN,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM;CAYzD"}

package/dist/{helpers/errors.js → internal/ExpressitError.js}

@@ -8,7 +8,7 @@ import { crop } from "@alanscodelog/utils/crop.js";
 import { indent } from "@alanscodelog/utils/indent.js";
 import { pretty } from "@alanscodelog/utils/pretty.js";
 import { version, repository } from "../package.js";
-class BooleanParserLibraryError extends Error {
+class ExpressitError extends Error {
   constructor(type, info, message) {
     super(
       message ? `${message}
@@ -39,5 +39,5 @@ function forceStringifyErrors(_key, value) {
   return value;
 }
 export {
-  BooleanParserLibraryError
+  ExpressitError
 };

package/dist/internal/applyBoolean.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyBoolean.d.ts","sourceRoot":"","sources":["../../src/internal/applyBoolean.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAO/E"}

package/dist/{helpers/general → internal}/applyPrefix.d.ts

@@ -1,4 +1,4 @@
-import type { PrefixApplier } from "../../types/parser.js";
+import type { PrefixApplier } from "../types/parser.js";
 /** @internal */
 export declare function applyPrefix(left: string | undefined, right: string, prefixApplier: PrefixApplier): string;
 //# sourceMappingURL=applyPrefix.d.ts.map

package/dist/internal/applyPrefix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyPrefix.d.ts","sourceRoot":"","sources":["../../src/internal/applyPrefix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,gBAAgB;AAChB,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,GAAG,MAAM,CAGzG"}

package/dist/{helpers/parser → internal}/checkParserOpts.d.ts

@@ -1,3 +1,4 @@
-import type { FullParserOptions } from "../../types/parser.js";
+import type { FullParserOptions } from "../types/parser.js";
+/** @internal */
 export declare function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evaluatorChecks?: boolean, validatorChecks?: boolean): void;
 //# sourceMappingURL=checkParserOpts.d.ts.map

package/dist/internal/checkParserOpts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkParserOpts.d.ts","sourceRoot":"","sources":["../../src/internal/checkParserOpts.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,oBAAoB,CAAA;AAE1E,gBAAgB;AAChB,wBAAgB,eAAe,CAAC,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,eAAe,GAAE,OAAe,EAAE,eAAe,GAAE,OAAe,GAAG,IAAI,CAoIlJ"}

package/dist/{helpers/parser → internal}/checkParserOpts.js

@@ -1,9 +1,9 @@
 import { isBlank } from "@alanscodelog/utils/isBlank.js";
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn.js";
-import { ERROR_CODES } from "../../types/errors.js";
-import { BooleanParserLibraryError } from "../errors.js";
-import { defaultConditionNormalizer } from "../general/defaultConditionNormalizer.js";
-import { defaultValueComparer } from "../general/defaultValueComparer.js";
+import { ExpressitError } from "./ExpressitError.js";
+import { defaultConditionNormalizer } from "../defaults/defaultConditionNormalizer.js";
+import { defaultValueComparer } from "../defaults/defaultValueComparer.js";
+import { ERROR_CODES } from "../types/errors.js";
 function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   if (!evaluatorChecks) {
@@ -21,7 +21,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     if (opts.customPropertyOperators)
       pushIfNotIn(extra, opts.customPropertyOperators);
     if (opts.expandedPropertySeparator && isBlank(opts.expandedPropertySeparator)) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
         { prohibited: [""], invalid: opts.expandedPropertySeparator },
         `expandedPropertySeparator cannot be blank`
@@ -29,7 +29,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     }
     const customInvalid = (_a = opts.customPropertyOperators) == null ? void 0 : _a.find((_) => isBlank(_));
     if (customInvalid !== void 0) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
         { prohibited: [""], invalid: customInvalid },
         `customPropertyOperators cannot contain blank entries`
@@ -37,7 +37,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     }
     const prefixInvalid = (_b = opts.prefixableStrings) == null ? void 0 : _b.find((_) => isBlank(_));
     if (prefixInvalid !== void 0) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
         { prohibited: [""], invalid: prefixInvalid },
         `prefixableStrings cannot contain blank entries`
@@ -46,7 +46,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;
       if (invalid !== void 0) {
-        throw new BooleanParserLibraryError(
+        throw new ExpressitError(
           ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
           { prohibited: [""], invalid },
           `keywords.${key} cannot contain entries with blank values`
@@ -59,7 +59,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     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));
     if (invalidPrefixableString) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
         { prohibited: all, invalid: invalidPrefixableString },
         `prefixableStrings ${messageInvalidAny} "${invalidPrefixableString}"`
@@ -67,7 +67,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     }
     const invalidExpandedPropertySeparator = allKeywords.find((_) => _ === opts.expandedPropertySeparator);
     if (invalidExpandedPropertySeparator) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
         { prohibited: allKeywords, invalid: invalidExpandedPropertySeparator },
         `expandedPropertySeparator ${messageInvalidBool} "${invalidExpandedPropertySeparator}"`
@@ -75,7 +75,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     }
     const invalidCustomPropertyOperator = ((_f = opts.customPropertyOperators) == null ? void 0 : _f.find((val) => keywords.includes(val))) ? opts.expandedPropertySeparator : void 0;
     if (invalidCustomPropertyOperator) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
         { prohibited: keywords, invalid: invalidCustomPropertyOperator },
         `customPropertyOperator ${messageInvalidBool} "${invalidCustomPropertyOperator}"`
@@ -93,7 +93,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     if (opts.regexValues)
       requireCustomNormalizer.push("regexValues");
     if (requireCustomNormalizer.length > 0 && opts.conditionNormalizer === defaultConditionNormalizer) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
         { options: requireCustomNormalizer, requires: "conditionNormalizer" },
         `A custom conditionNormalizer function must be specified when using the following options: ${requireCustomNormalizer.join(", ")}`
@@ -105,7 +105,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     if (opts.regexValues)
       requireCustomComparer.push("arrayValues");
     if (requireCustomComparer.length > 0 && opts.valueComparer === defaultValueComparer) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
         { options: requireCustomComparer, requires: "valueComparer" },
         `A custom valueComparer function must be specified when using the following options: ${requireCustomComparer.join(", ")}`
@@ -114,7 +114,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
   }
   if (validatorChecks) {
     if (opts.valueValidator === void 0) {
-      throw new BooleanParserLibraryError(
+      throw new ExpressitError(
         ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
         { requires: "valueValidator" },
         `A custom valueValidator function must be specified when using the validate method.`

package/dist/internal/escapeVariableOrPrefix.d.ts

@@ -0,0 +1,2 @@
+export declare function escapeVariableOrPrefix(variable: string, preferredQuote: string): string;
+//# sourceMappingURL=escapeVariableOrPrefix.d.ts.map

package/dist/internal/escapeVariableOrPrefix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"escapeVariableOrPrefix.d.ts","sourceRoot":"","sources":["../../src/internal/escapeVariableOrPrefix.ts"],"names":[],"mappings":"AAEA,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAiCvF"}

package/dist/internal/escapeVariableOrPrefix.js

@@ -0,0 +1,38 @@
+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.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 === "\\") {
+        i += 2;
+        continue;
+      }
+      if (char === " ") {
+        doQuote = true;
+      }
+      if (char === quoteType)
+        indexes.push(i);
+    }
+    if (indexes.length === 0)
+      break;
+    const newVal = multisplice(variable.split(""), indexes, 0, "\\").array.join("");
+    variable = newVal;
+    break;
+  }
+  if (doQuote) {
+    variable = `${preferredQuote}${variable}${preferredQuote}`;
+  }
+  return variable;
+}
+export {
+  escapeVariableOrPrefix
+};

package/dist/internal/extractPosition.d.ts

@@ -0,0 +1,5 @@
+import type { Token } from "../Lexer.js";
+import type { Position } from "../types/ast.js";
+/** @internal */
+export declare function extractPosition(pos: Pick<Token, "startOffset" | "endOffset">, shift: number): Position;
+//# sourceMappingURL=extractPosition.d.ts.map

package/dist/internal/extractPosition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractPosition.d.ts","sourceRoot":"","sources":["../../src/internal/extractPosition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAG/C,gBAAgB;AAChB,wBAAgB,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,CAKtG"}

package/dist/internal/getUnclosedRightParenCount.d.ts

@@ -0,0 +1,4 @@
+import { type Token } from "../Lexer.js";
+/** @internal */
+export declare function getUnclosedRightParenCount(tokens: Token[]): number;
+//# sourceMappingURL=getUnclosedRightParenCount.d.ts.map

package/dist/internal/getUnclosedRightParenCount.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUnclosedRightParenCount.d.ts","sourceRoot":"","sources":["../../src/internal/getUnclosedRightParenCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AAG5C,gBAAgB;AAEhB,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAelE"}

package/dist/{helpers/parser → internal}/getUnclosedRightParenCount.js

@@ -1,4 +1,4 @@
-import { $T } from "../../Lexer.js";
+import { $T } from "../Lexer.js";
 function getUnclosedRightParenCount(tokens) {
   let open = 0;
   let unclosed = 0;

package/dist/{helpers/parser → internal}/parseParserOptions.d.ts

@@ -1,4 +1,4 @@
-import type { FullParserOptions, ParserOptions } from "../../types/parser.js";
+import type { FullParserOptions, ParserOptions } from "../types/parser.js";
 /** @internal */
 export declare function parseParserOptions<T extends {} = {}>(options: ParserOptions<T>): FullParserOptions<T>;
 //# sourceMappingURL=parseParserOptions.d.ts.map

package/dist/internal/parseParserOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseParserOptions.d.ts","sourceRoot":"","sources":["../../src/internal/parseParserOptions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAE1E,gBAAgB;AAChB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EACnD,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GACvB,iBAAiB,CAAC,CAAC,CAAC,CA4CtB"}

package/dist/{helpers/parser → internal}/parseParserOptions.js

@@ -1,7 +1,7 @@
-import { defaultConditionNormalizer } from "../general/defaultConditionNormalizer.js";
-import { defaultKeyParser } from "../general/defaultKeyParser.js";
-import { defaultPrefixApplier } from "../general/defaultPrefixApplier.js";
-import { defaultValueComparer } from "../general/defaultValueComparer.js";
+import { defaultConditionNormalizer } from "../defaults/defaultConditionNormalizer.js";
+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 = {

package/dist/internal/unescape.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unescape.d.ts","sourceRoot":"","sources":["../../src/internal/unescape.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C"}

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.1.2";
+const version = "0.2.0";
 const types = "./dist/index.d.ts";
 const type = "module";
 const module = "./dist/index.js";
@@ -18,13 +18,13 @@ const exports = {
     types: "./dist/ast/*",
     "import": "./dist/ast/*"
   },
-  "./helpers": {
-    types: "./dist/helpers/index.d.ts",
-    "import": "./dist/helpers/index.js"
+  "./internal": {
+    types: "./dist/internal/index.d.ts",
+    "import": "./dist/internal/index.js"
   },
-  "./helpers/*": {
-    types: "./dist/helpers/*",
-    "import": "./dist/helpers/*"
+  "./internal/*": {
+    types: "./dist/internal/*",
+    "import": "./dist/internal/*"
   },
   "./methods": {
     types: "./dist/methods/index.d.ts",