@witchcraft/expressit 0.2.2 → 0.3.1

package/dist/ast/builders/error.d.ts

@@ -1,8 +1,8 @@
-import { type ErrorToken, TOKEN_TYPE } from "../../types/ast.js";
+import { type ErrorToken, type TokenType } from "../../types/ast.js";
 /**
  * Creates an error token.
  *
  * @param expected Can be passed an array of {@link ValidToken_TYPE} or strings, in which case it will use {@link type} internally. So instead of `[TOKEN_TYPE.VALUE]` we can do `[""]` and instead of `[TOKEN_TYPE.PARENR]` we can do `[")"]`.
  */
-export declare function error<T extends TOKEN_TYPE>(pos: number, expected: T[]): ErrorToken;
+export declare function error<T extends TokenType>(pos: number, expected: T[]): ErrorToken;
 //# sourceMappingURL=error.d.ts.map

package/dist/ast/builders/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAC,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAI/D;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,UAAU,CAAA"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAa,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAI/E;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,UAAU,CAAA"}

package/dist/ast/builders/expression.d.ts

@@ -1,8 +1,8 @@
-import { type AnyToken, type ConditionNode, type ErrorToken, type ExpressionNode, type GroupNode, type TokenBooleanTypes } from "../../types/ast.js";
+import { type AnyToken, type ConditionNode, type ErrorToken, type ExpressionNode, type GroupNode, type TokenBoolean } from "../../types/ast.js";
 /**
  * Creates an {@link ExpressionNode}, can be passed nothing for any of the tokens to automatically create error tokens.
  *
  * Also automatically sets the correct start/end positions from valid tokens (e.g. for start, searching left to right for a valid token and vice versa) assuming at least one is defined.
  */
-export declare function expression(left: ConditionNode | ExpressionNode | GroupNode | ErrorToken | undefined, operator: AnyToken<TokenBooleanTypes> | undefined, right: ConditionNode | ExpressionNode | GroupNode | ErrorToken | undefined): ExpressionNode;
+export declare function expression(left: ConditionNode | ExpressionNode | GroupNode | ErrorToken | undefined, operator: AnyToken<TokenBoolean> | undefined, right: ConditionNode | ExpressionNode | GroupNode | ErrorToken | undefined): ExpressionNode;
 //# sourceMappingURL=expression.d.ts.map

package/dist/ast/builders/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/expression.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAC,KAAK,SAAS,EAA6B,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAI9K;;;;GAIG;AACH,wBAAgB,UAAU,CACzB,IAAI,EACH,aAAa,GACb,cAAc,GACd,SAAS,GACT,UAAU,GACV,SAAS,EACV,QAAQ,EACP,QAAQ,CAAC,iBAAiB,CAAC,GAC3B,SAAS,EACV,KAAK,EACJ,aAAa,GACb,cAAc,GACd,SAAS,GACT,UAAU,GACV,SAAS,GACR,cAAc,CA+BhB"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/expression.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAC,KAAK,SAAS,EAA6B,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAIzK;;;;GAIG;AACH,wBAAgB,UAAU,CACzB,IAAI,EACH,aAAa,GACb,cAAc,GACd,SAAS,GACT,UAAU,GACV,SAAS,EACV,QAAQ,EACP,QAAQ,CAAC,YAAY,CAAC,GACtB,SAAS,EACV,KAAK,EACJ,aAAa,GACb,cAAc,GACd,SAAS,GACT,UAAU,GACV,SAAS,GACR,cAAc,CA2BhB"}

package/dist/ast/builders/expression.js

@@ -3,19 +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 });
-  if (left === void 0) {
-    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;
-  if (right === void 0) {
-    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.d.ts

@@ -8,7 +8,7 @@ import { type ConditionNode, type ErrorToken, type ExpressionNode, type GroupNod
  *
  * The positions of the parens can be adjusted with the last two parameters by passing positions.
  */
-export declare function group(prefix: ConditionNode | ValidToken<TOKEN_TYPE.NOT> | undefined, expression: ConditionNode | ExpressionNode | GroupNode | ErrorToken | undefined, paren?: {
+export declare function group(prefix: ConditionNode | ValidToken<typeof TOKEN_TYPE.NOT> | undefined, expression: ConditionNode | ExpressionNode | GroupNode | ErrorToken | undefined, paren?: {
     left?: boolean;
     right?: boolean;
 }, parenLeftPos?: Position, parenRightPos?: Position): GroupNode;

package/dist/ast/builders/group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"group.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAkB,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAGzK;;;;;;;;GAQG;AAEH,wBAAgB,KAAK,CACpB,MAAM,EACJ,aAAa,GACb,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAC1B,SAAS,EAEX,UAAU,EACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,UAAU,GACV,SAAS,EAEX,KAAK,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAgC,EACxE,YAAY,CAAC,EAAE,QAAQ,EACvB,aAAa,CAAC,EAAE,QAAQ,GACtB,SAAS,CA2CX"}
+{"version":3,"file":"group.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAkB,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAGzK;;;;;;;;GAQG;AAEH,wBAAgB,KAAK,CACpB,MAAM,EACJ,aAAa,GACb,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,GACjC,SAAS,EAEX,UAAU,EACR,aAAa,GACb,cAAc,GACd,SAAS,GACT,UAAU,GACV,SAAS,EAEX,KAAK,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAgC,EACxE,YAAY,CAAC,EAAE,QAAQ,EACvB,aAAa,CAAC,EAAE,QAAQ,GACtB,SAAS,CAyCX"}

package/dist/ast/builders/group.js

@@ -2,17 +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;
-  if (expression === void 0) {
-    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");
     }
@@ -20,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) {
@@ -30,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) {
@@ -38,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/pos.d.ts

@@ -1,4 +1,4 @@
-import type { AnyToken, AST_TYPE, EmptyObj, Node, Position, TOKEN_TYPE } from "../../types/ast.js";
+import type { AnyToken, AstType, EmptyObj, Node, Position, TokenType } from "../../types/ast.js";
 /**
  * Can either:
  *
@@ -15,6 +15,6 @@ export declare function pos<TItem extends Position | Partial<Position> | EmptyOb
 } ? Position : EmptyObj;
 export declare function pos<TItem extends Position | Partial<Position> | EmptyObj>(item: TItem, opts?: undefined | {
     fill: false;
-}): TItem extends Position ? Position : TItem extends AnyToken<TOKEN_TYPE> | Position | EmptyObj ? Position | EmptyObj : TItem extends Node<AST_TYPE> | Position | EmptyObj ? Position | EmptyObj : EmptyObj;
+}): TItem extends Position ? Position : TItem extends AnyToken<TokenType> | Position | EmptyObj ? Position | EmptyObj : TItem extends Node<AstType> | Position | EmptyObj ? Position | EmptyObj : EmptyObj;
 export declare function pos(start: number, end: number): Position;
 //# sourceMappingURL=pos.d.ts.map

package/dist/ast/builders/pos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pos.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/pos.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAElG;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,KAAK,SAAS,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,EACxE,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GAClB,KAAK,SAAS;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GACjD,QAAQ,GACR,QAAQ,CAAA;AACX,wBAAgB,GAAG,CAAC,KAAK,SAAS,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,EACxE,IAAI,EAAE,KAAK,EACX,IAAI,CAAC,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAGlC,KAAK,SAAS,QAAQ,GACpB,QAAQ,GACR,KAAK,SAAS,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,GAAG,QAAQ,GACxD,QAAQ,GAAG,QAAQ,GACnB,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,QAAQ,GAClD,QAAQ,GAAG,QAAQ,GACnB,QAAQ,CAAA;AACX,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"pos.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/pos.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEhG;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,KAAK,SAAS,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,EACxE,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GAClB,KAAK,SAAS;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GACjD,QAAQ,GACR,QAAQ,CAAA;AACX,wBAAgB,GAAG,CAAC,KAAK,SAAS,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,EACxE,IAAI,EAAE,KAAK,EACX,IAAI,CAAC,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAGlC,KAAK,SAAS,QAAQ,GACpB,QAAQ,GACR,KAAK,SAAS,QAAQ,CAAC,SAAS,CAAC,GAAG,QAAQ,GAAG,QAAQ,GACvD,QAAQ,GAAG,QAAQ,GACnB,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,QAAQ,GACjD,QAAQ,GAAG,QAAQ,GACnB,QAAQ,CAAA;AACX,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA"}

package/dist/ast/builders/token.d.ts

@@ -1,4 +1,4 @@
-import type { EmptyObj, ErrorToken, Position, TOKEN_TYPE, ValidToken } from "../../types/ast.js";
+import type { EmptyObj, ErrorToken, Position, TokenType, ValidToken } from "../../types/ast.js";
 /**
  * Creates a {@link ValidToken} or of the given type with the given value. If no value is given, creates an {@link ErrorToken} instead.
  *
@@ -6,5 +6,5 @@ import type { EmptyObj, ErrorToken, Position, TOKEN_TYPE, ValidToken } from "../
  *
  * If the token is an error token, just `start` or `end` can be passed, and the other position will be filled to the same value.
  */
-export declare function token<TValue extends string | undefined, TType extends TOKEN_TYPE = TOKEN_TYPE>(type: TValue extends undefined ? TType | TType[] : TType, value: TValue, position?: Position | Partial<Position> | EmptyObj): TValue extends undefined ? ErrorToken : ValidToken<TType>;
+export declare function token<TValue extends string | undefined, TType extends TokenType = TokenType>(type: TValue extends undefined ? TType | TType[] : TType, value: TValue, position?: Position | Partial<Position> | EmptyObj): TValue extends undefined ? ErrorToken : ValidToken<TType>;
 //# sourceMappingURL=token.d.ts.map

package/dist/ast/builders/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/token.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAY,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAI1G;;;;;;GAMG;AAEH,wBAAgB,KAAK,CACpB,MAAM,SAAS,MAAM,GAAG,SAAS,EACjC,KAAK,SAAS,UAAU,GAAG,UAAU,EAErC,IAAI,EAAE,MAAM,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,KAAK,EACxD,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAa,GACpD,MAAM,SAAS,SAAS,GACxB,UAAU,GACV,UAAU,CAAC,KAAK,CAAC,CAmBnB"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/token.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAY,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAIzG;;;;;;GAMG;AAEH,wBAAgB,KAAK,CACpB,MAAM,SAAS,MAAM,GAAG,SAAS,EACjC,KAAK,SAAS,SAAS,GAAG,SAAS,EAEnC,IAAI,EAAE,MAAM,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,KAAK,EACxD,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAa,GACpD,MAAM,SAAS,SAAS,GACxB,UAAU,GACV,UAAU,CAAC,KAAK,CAAC,CAmBnB"}

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/type.d.ts

@@ -1,6 +1,6 @@
-import { type ExtractTokenType } from "../../types/ast.js";
+import { type ExtractToken } from "../../types/ast.js";
 /**
  * Given a the string value of an operator or single delimiter token, returns the corresponding {@link ValidToken_TYPE} .
  */
-export declare function type<T extends string>(operatorSymbol: T): ExtractTokenType<T>;
+export declare function type<T extends string>(operatorSymbol: T): ExtractToken<T>;
 //# sourceMappingURL=type.d.ts.map

package/dist/ast/builders/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,oBAAoB,CAAA;AACtE;;GAEG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,EACpC,cAAc,EAAE,CAAC,GACf,gBAAgB,CAAC,CAAC,CAAC,CAwBrB"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAc,MAAM,oBAAoB,CAAA;AAClE;;GAEG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,EACpC,cAAc,EAAE,CAAC,GACf,YAAY,CAAC,CAAC,CAAC,CAwBjB"}

package/dist/ast/builders/variable.d.ts

@@ -1,4 +1,4 @@
-import { type AnyToken, type EmptyObj, type Position, TOKEN_TYPE, type TokenQuoteTypes, type ValidToken, type VariableNode } from "../../types/ast.js";
+import { type AnyToken, type EmptyObj, type Position, TOKEN_TYPE, type TokenQuote, type ValidToken, type VariableNode } from "../../types/ast.js";
 /**
  * Creates an {@link VariableNode} .
  *
@@ -6,8 +6,8 @@ import { type AnyToken, type EmptyObj, type Position, TOKEN_TYPE, type TokenQuot
  *
  * @param position Refers to position of the value (in case it needs to be created) not the node. Quote positions are automatically calculated from this if used. If value is already a token, there's no need to pass a position, it can be extracted from the token.
  */
-export declare function variable(prefix: ValidToken<TOKEN_TYPE.VALUE> | undefined, value: string | AnyToken<TOKEN_TYPE.VALUE>, quote?: {
-    type: TokenQuoteTypes;
+export declare function variable(prefix: ValidToken<typeof TOKEN_TYPE.VALUE> | undefined, value: string | AnyToken<typeof TOKEN_TYPE.VALUE>, quote?: {
+    type: TokenQuote;
     left?: boolean;
     right?: boolean;
     flags?: string;

package/dist/ast/builders/variable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/variable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAkB,KAAK,QAAQ,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAItK;;;;;;GAMG;AAEH,wBAAgB,QAAQ,CACvB,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,SAAS,EAChD,KAAK,EAAE,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAC1C,KAAK,CAAC,EAAE;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAClF,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAC5B,YAAY,CAwDd"}
+{"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../../src/ast/builders/variable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAkB,KAAK,QAAQ,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAIjK;;;;;;GAMG;AAEH,wBAAgB,QAAQ,CACvB,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,SAAS,EACvD,KAAK,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,UAAU,CAAC,KAAK,CAAC,EACjD,KAAK,CAAC,EAAE;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7E,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAC5B,YAAY,CAwDd"}

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.d.ts

@@ -1,5 +1,5 @@
 import { type ConditionNode, type TOKEN_TYPE, type ValidToken } from "../types/ast.js";
-export declare function createConditionNode<TValid extends boolean = boolean, TOperator extends ValidToken<TOKEN_TYPE.NOT> | undefined = ValidToken<TOKEN_TYPE.NOT> | undefined>(raw: {
+export declare function createConditionNode<TValid extends boolean = boolean, TOperator extends ValidToken<typeof TOKEN_TYPE.NOT> | undefined = ValidToken<typeof TOKEN_TYPE.NOT> | undefined>(raw: {
     operator?: TOperator;
     property?: ConditionNode<TValid>["property"];
     propertyOperator?: ConditionNode<TValid>["propertyOperator"];

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

@@ -1 +1 @@
-{"version":3,"file":"createConditionNode.d.ts","sourceRoot":"","sources":["../../src/ast/createConditionNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAIhG,wBAAgB,mBAAmB,CAClC,MAAM,SAAS,OAAO,GAAG,OAAO,EAChC,SAAS,SACR,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,GACtC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,EACtC,GAAG,EAAE;IACN,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,QAAQ,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAA;IAC5C,gBAAgB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC5D,GAAG,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAA;IAClC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAA;IACrC,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;CACX,GACE,aAAa,CAAC,MAAM,CAAC,CAuCvB"}
+{"version":3,"file":"createConditionNode.d.ts","sourceRoot":"","sources":["../../src/ast/createConditionNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAIhG,wBAAgB,mBAAmB,CAClC,MAAM,SAAS,OAAO,GAAG,OAAO,EAChC,SAAS,SACR,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,GAC7C,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,EAC7C,GAAG,EAAE;IACN,QAAQ,CAAC,EAAE,SAAS,CAAA;IACpB,QAAQ,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAA;IAC5C,gBAAgB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC5D,GAAG,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAA;IAClC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAA;IACrC,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;CACX,GACE,aAAa,CAAC,MAAM,CAAC,CAuCvB"}

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/createGroupNode.d.ts

@@ -1,5 +1,5 @@
 import { type ConditionNode, type GroupNode, type RawNode, type TOKEN_TYPE, type ValidToken } from "../types/ast.js";
-export declare function createGroupNode<TValid extends boolean = boolean, TPrefixable extends boolean = true, TPrefix extends TPrefixable extends true ? ConditionNode<TValid> | ValidToken<TOKEN_TYPE.NOT> | undefined : ValidToken<TOKEN_TYPE.NOT> | undefined = TPrefixable extends true ? ConditionNode<TValid> | ValidToken<TOKEN_TYPE.NOT> | undefined : ValidToken<TOKEN_TYPE.NOT>>(raw: {
+export declare function createGroupNode<TValid extends boolean = boolean, TPrefixable extends boolean = true, TPrefix extends TPrefixable extends true ? ConditionNode<TValid> | ValidToken<typeof TOKEN_TYPE.NOT> | undefined : ValidToken<typeof TOKEN_TYPE.NOT> | undefined = TPrefixable extends true ? ConditionNode<TValid> | ValidToken<typeof TOKEN_TYPE.NOT> | undefined : ValidToken<typeof TOKEN_TYPE.NOT>>(raw: {
     prefix: TPrefix;
 } & RawNode<GroupNode<TValid>>): GroupNode<TValid, TPrefixable, TPrefix>;
 //# sourceMappingURL=createGroupNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createGroupNode.d.ts","sourceRoot":"","sources":["../../src/ast/createGroupNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAK9H,wBAAgB,eAAe,CAC9B,MAAM,SAAS,OAAO,GAAG,OAAO,EAChC,WAAW,SAAS,OAAO,GAAG,IAAI,EAClC,OAAO,SACN,WAAW,SAAS,IAAI,GACrB,aAAa,CAAC,MAAM,CAAC,GACvB,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAC1B,SAAS,GACP,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAC5B,SAAS,GACV,WAAW,SAAS,IAAI,GACrB,aAAa,CAAC,MAAM,CAAC,GACvB,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAC1B,SAAS,GACP,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAC7B,GAAG,EAAE;IACN,MAAM,EAAE,OAAO,CAAA;CACf,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAsBvE"}
+{"version":3,"file":"createGroupNode.d.ts","sourceRoot":"","sources":["../../src/ast/createGroupNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAK9H,wBAAgB,eAAe,CAC9B,MAAM,SAAS,OAAO,GAAG,OAAO,EAChC,WAAW,SAAS,OAAO,GAAG,IAAI,EAClC,OAAO,SACN,WAAW,SAAS,IAAI,GACrB,aAAa,CAAC,MAAM,CAAC,GACvB,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,GACjC,SAAS,GACP,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,GACnC,SAAS,GACV,WAAW,SAAS,IAAI,GACrB,aAAa,CAAC,MAAM,CAAC,GACvB,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,GACjC,SAAS,GACP,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,CAAC,EACpC,GAAG,EAAE;IACN,MAAM,EAAE,OAAO,CAAA;CACf,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAsBvE"}

package/dist/ast/createToken.d.ts

@@ -1,5 +1,5 @@
-import type { ErrorToken, RawToken, TOKEN_TYPE, ValidToken } from "../types/ast.js";
-export declare function createToken<TType extends TOKEN_TYPE>(raw: {
+import type { ErrorToken, RawToken, TokenType, ValidToken } from "../types/ast.js";
+export declare function createToken<TType extends TokenType>(raw: {
     type: TType;
 } & RawToken<ValidToken>): ValidToken<TType>;
 export declare function createToken(raw: RawToken<ErrorToken>): ErrorToken;

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

@@ -1 +1 @@
-{"version":3,"file":"createToken.d.ts","sourceRoot":"","sources":["../../src/ast/createToken.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGnF,wBAAgB,WAAW,CAC1B,KAAK,SAAS,UAAU,EACvB,GAAG,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;AACjE,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,CAAA"}
+{"version":3,"file":"createToken.d.ts","sourceRoot":"","sources":["../../src/ast/createToken.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGlF,wBAAgB,WAAW,CAC1B,KAAK,SAAS,SAAS,EACtB,GAAG,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;AACjE,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,CAAA"}

package/dist/ast/createToken.js

@@ -1,8 +1,8 @@
 import { ExpressitError } from "../internal/ExpressitError.js";
-import { ERROR_CODES } from "../types/errors.js";
+import { PARSER_ERROR } from "../types/errors.js";
 function createToken(raw) {
   if (raw.start === void 0 || raw.end === void 0) {
-    throw new ExpressitError(ERROR_CODES.PARSER_POSITION_ERROR, raw);
+    throw new ExpressitError(PARSER_ERROR.POSITION_ERROR, raw);
   }
   return {
     ...raw,

package/dist/ast/error.d.ts

@@ -1,3 +1,3 @@
-import { type ErrorToken, type TOKEN_TYPE } from "../types/ast.js";
-export declare function error<T extends TOKEN_TYPE>(pos: number, expected: T[]): ErrorToken;
+import { type ErrorToken, type TokenType } from "../types/ast.js";
+export declare function error<T extends TokenType>(pos: number, expected: T[]): ErrorToken;
 //# sourceMappingURL=error.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/ast/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjE,wBAAgB,KAAK,CAAC,CAAC,SAAS,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,UAAU,CAGlF"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/ast/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAC,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEhE,wBAAgB,KAAK,CAAC,CAAC,SAAS,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,UAAU,CAGjF"}

package/dist/ast/error.js

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

package/dist/ast/handlers.d.ts

@@ -1,35 +1,35 @@
-import { type AnyToken, type ArrayNode, type ConditionNode, type ErrorToken, type ExpressionNode, type GroupNode, type Position, TOKEN_TYPE, type TokenBooleanTypes, type TokenQuoteTypes, type ValidToken, type VariableNode } from "../types/ast.js";
-declare function error<T extends TOKEN_TYPE>(pos: number, expected: T[]): ErrorToken;
+import { type AnyToken, type ArrayNode, type ConditionNode, type ErrorToken, type ExpressionNode, type GroupNode, type Position, TOKEN_TYPE, type TokenBoolean, type TokenQuote, type TokenType, type ValidToken, type VariableNode } from "../types/ast.js";
+declare function error<T extends TokenType>(pos: number, expected: T[]): ErrorToken;
 export declare const token: {
-    value: <TVal extends string | undefined>(value: TVal, pos: Position) => TVal extends string ? ValidToken<TOKEN_TYPE.VALUE> : ErrorToken;
-    custom: <TVal extends string | undefined>(value: TVal, pos: Position) => TVal extends string ? ValidToken<TOKEN_TYPE.OP_CUSTOM> : ErrorToken;
-    sep: <TVal extends string | undefined>(value: TVal, pos: Position) => TVal extends string ? ValidToken<TOKEN_TYPE.OP_EXPANDED_SEP> : ErrorToken;
+    value: <TVal extends string | undefined>(value: TVal, pos: Position) => TVal extends string ? ValidToken<"VALUE"> : ErrorToken;
+    custom: <TVal extends string | undefined>(value: TVal, pos: Position) => TVal extends string ? ValidToken<"OP_CUSTOM"> : ErrorToken;
+    sep: <TVal extends string | undefined>(value: TVal, pos: Position) => TVal extends string ? ValidToken<"OP_EXPANDED_SEP"> : ErrorToken;
 };
 /** We want to handle all the types outside the grammar file. This makes it easier without trying to check the value. */
 export declare const delimiter: {
-    parenL: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.PARENL> | undefined;
-    parenR: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.PARENR> | undefined;
-    bracketL: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.BRACKETL> | undefined;
-    bracketR: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.BRACKETR> | undefined;
-    double: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.DOUBLEQUOTE> | undefined;
-    single: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.SINGLEQUOTE> | undefined;
-    regex: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.REGEX> | undefined;
-    tick: (value: string | undefined, pos: Position) => ValidToken<TOKEN_TYPE.BACKTICK> | undefined;
+    parenL: (value: string | undefined, pos: Position) => ValidToken<"PARENL"> | undefined;
+    parenR: (value: string | undefined, pos: Position) => ValidToken<"PARENR"> | undefined;
+    bracketL: (value: string | undefined, pos: Position) => ValidToken<"BRACKETL"> | undefined;
+    bracketR: (value: string | undefined, pos: Position) => ValidToken<"BRACKETR"> | undefined;
+    double: (value: string | undefined, pos: Position) => ValidToken<"DOUBLEQUOTE"> | undefined;
+    single: (value: string | undefined, pos: Position) => ValidToken<"SINGLEQUOTE"> | undefined;
+    regex: (value: string | undefined, pos: Position) => ValidToken<"REGEX"> | undefined;
+    tick: (value: string | undefined, pos: Position) => ValidToken<"BACKTICK"> | undefined;
     tokenError: typeof error;
 };
 export declare const operator: {
-    and: (value: string, pos: Position) => ValidToken<TOKEN_TYPE.AND>;
-    or: (value: string, pos: Position) => ValidToken<TOKEN_TYPE.OR>;
-    not: (value: string, pos: Position) => ValidToken<TOKEN_TYPE.NOT>;
+    and: (value: string, pos: Position) => ValidToken<"AND">;
+    or: (value: string, pos: Position) => ValidToken<"OR">;
+    not: (value: string, pos: Position) => ValidToken<"NOT">;
 };
-export declare function variable(prefix: ValidToken<TOKEN_TYPE.VALUE> | null | undefined, quoteL: AnyToken<TokenQuoteTypes> | null | undefined, value: AnyToken<TOKEN_TYPE.VALUE> | null | undefined, quoteR: AnyToken<TokenQuoteTypes> | null | undefined, flags?: ValidToken<TOKEN_TYPE.VALUE>): VariableNode;
-export declare function condition(not: ValidToken<TOKEN_TYPE.NOT> | null | undefined, property: VariableNode | null | undefined, { propertyOperator, sepL, sepR }?: {
+export declare function variable(prefix: ValidToken<typeof TOKEN_TYPE.VALUE> | null | undefined, quoteL: AnyToken<TokenQuote> | null | undefined, value: AnyToken<typeof TOKEN_TYPE.VALUE> | null | undefined, quoteR: AnyToken<TokenQuote> | null | undefined, flags?: ValidToken<typeof TOKEN_TYPE.VALUE>): VariableNode;
+export declare function condition(not: ValidToken<typeof TOKEN_TYPE.NOT> | null | undefined, property: VariableNode | null | undefined, { propertyOperator, sepL, sepR }?: {
     propertyOperator?: ConditionNode["propertyOperator"] | null;
-    sepL?: ValidToken<TOKEN_TYPE.OP_EXPANDED_SEP> | null;
-    sepR?: ValidToken<TOKEN_TYPE.OP_EXPANDED_SEP> | null;
+    sepL?: ValidToken<typeof TOKEN_TYPE.OP_EXPANDED_SEP> | null;
+    sepR?: ValidToken<typeof TOKEN_TYPE.OP_EXPANDED_SEP> | null;
 }, value?: VariableNode | GroupNode | ArrayNode | null): ConditionNode;
-export declare function expression(left: ConditionNode | GroupNode | null | undefined, operator: ValidToken<TokenBooleanTypes> | null | undefined, right: ConditionNode | GroupNode | null | undefined): ExpressionNode;
-export declare function group(operator: ValidToken<TOKEN_TYPE.NOT> | null | undefined, prefix: ConditionNode | null | undefined, parenL: ValidToken<TOKEN_TYPE.PARENL> | null | undefined, condition: GroupNode["expression"], parenR: ValidToken<TOKEN_TYPE.PARENR> | null | undefined): GroupNode;
-export declare function array(bracketL: ValidToken<TOKEN_TYPE.BRACKETL>, values: VariableNode[], bracketR: ValidToken<TOKEN_TYPE.BRACKETR> | null | undefined): ArrayNode;
+export declare function expression(left: ConditionNode | GroupNode | null | undefined, operator: ValidToken<TokenBoolean> | null | undefined, right: ConditionNode | GroupNode | null | undefined): ExpressionNode;
+export declare function group(operator: ValidToken<typeof TOKEN_TYPE.NOT> | null | undefined, prefix: ConditionNode | null | undefined, parenL: ValidToken<typeof TOKEN_TYPE.PARENL> | null | undefined, condition: GroupNode["expression"], parenR: ValidToken<typeof TOKEN_TYPE.PARENR> | null | undefined): GroupNode;
+export declare function array(bracketL: ValidToken<typeof TOKEN_TYPE.BRACKETL>, values: VariableNode[], bracketR: ValidToken<typeof TOKEN_TYPE.BRACKETR> | null | undefined): ArrayNode;
 export {};
 //# sourceMappingURL=handlers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../src/ast/handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../src/ast/handlers.ts"],"names":[],"mappings":"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"}

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,17 +56,16 @@ 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 ? value : error(end, [TOKEN_TYPE.VALUE]),
+    value: value ?? error(end, [TOKEN_TYPE.VALUE]),
     start,
     end
   };
@@ -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.d.ts

@@ -26,18 +26,18 @@ export interface BaseOperatorDefinition {
     /** How to compare the value when evualuating a condition. This is only used if using `evaluate`. */
     valueComparer: (condition: any, contextValue: any) => boolean;
 }
-export type BaseErrorTokenTypes = "invalidKey" | "unknownProperty" | "unknownOperator" | "unknownOperatorForType" | "invalidValueType";
+export type SqlParserError = "invalidKey" | "unknownProperty" | "unknownOperator" | "unknownOperatorForType" | "invalidValueType";
 export declare class ParserWithSqlSupport<TErrorToken extends Position & {
-    type: BaseErrorTokenTypes;
+    type: SqlParserError;
     message?: string;
 } = Position & {
-    type: BaseErrorTokenTypes;
+    type: SqlParserError;
     message?: string;
 }, TPropertyDefinition extends BasePropertyDefinition = BasePropertyDefinition, TPropertyDefinitions extends Record<string, TPropertyDefinition> = Record<string, TPropertyDefinition>, TOperatorDefinition extends BaseOperatorDefinition = BaseOperatorDefinition, TOperatorDefinitions extends Record<string, TOperatorDefinition> = Record<string, TOperatorDefinition>, TSqlEscapeValue extends (value: string) => any | ReturnType<TSqlEscapeValue> = (value: string) => any> extends Parser<TErrorToken> {
-    propertyDefinitions: TPropertyDefinitions;
-    operatorDefinitions: TOperatorDefinitions;
     sqlEscapeValue: TSqlEscapeValue;
     operatorMap: Record<string, string>;
+    propertyDefinitions: TPropertyDefinitions;
+    operatorDefinitions: TOperatorDefinitions;
     constructor(propertyDefinitions: TPropertyDefinitions, operatorDefinitions: TOperatorDefinitions, { sqlEscapeValue }: {
         sqlEscapeValue: TSqlEscapeValue;
     });

package/dist/examples/ParserWithSqlSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ParserWithSqlSupport.d.ts","sourceRoot":"","sources":["../../src/examples/ParserWithSqlSupport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ParserWithSqlSupport.d.ts","sourceRoot":"","sources":["../../src/examples/ParserWithSqlSupport.ts"],"names":[],"mappings":"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"}