@witchcraft/expressit 0.1.2 → 0.2.0

package/dist/types/ast.d.ts

@@ -1,5 +1,4 @@
 import type { AnyFunction } from "@alanscodelog/utils/types";
-import type { ArrayNode, ConditionNode, ErrorToken, ExpressionNode, GroupNode, ValidToken, VariableNode } from "../ast/classes/index.js";
 export type AddParameters<T extends AnyFunction, TExtra extends any[] = [boolean]> = (...args: [...Parameters<T>, ...TExtra]) => ReturnType<T>;
 export declare enum TOKEN_TYPE {
     VALUE = "VALUE",
@@ -30,28 +29,146 @@ export type TokenBooleanTypes = TOKEN_TYPE.AND | TOKEN_TYPE.OR;
 export type TokenOperatorTypes = TokenBooleanTypes | TOKEN_TYPE.NOT;
 export type TokenPropertyOperatorTypes = TOKEN_TYPE.OP_CUSTOM | TOKEN_TYPE.OP_EXPANDED_SEP;
 export type EmptyObj = Record<any, never>;
-export type FirstConstructorParam<T extends new (...args: any) => any> = ConstructorParameters<T>["0"];
+export type FirstParam<T extends AnyFunction> = Parameters<T>["0"];
 export type Position = {
     start: number;
     end: number;
 };
 export declare enum AST_TYPE {
     EXPRESSION = "EXPRESSION",
+    NORMALIZED_EXPRESSION = "NORMALIZED_EXPRESSION",
     GROUP = "GROUP",
     ARRAY = "ARRAY",
     CONDITION = "CONDITION",
+    NORMALIZED_CONDITION = "NORMALIZED_CONDITION",
     VARIABLE = "VARIABLE"
 }
+export type RawNode<T extends Node> = Omit<T, "valid" | "type" | "isNode">;
+/**
+ * The base type from which {@link ValidToken} and {@link ErrorToken} extend.
+ *
+ * Mostly for internal use, and I would suggest using {@link AnyToken} instead of this for typing things.
+ *
+ */
+export interface BaseToken {
+    isToken: true;
+    start: number;
+    end: number;
+}
+/**
+ * Valid tokens always have a value, even if it might be an empty string.
+ */
+export interface ValidToken<TType extends TOKEN_TYPE = TOKEN_TYPE> extends BaseToken {
+    valid: true;
+    type: TType;
+    value: string;
+}
+/**
+ * The type for invalid recovery tokens.
+ *
+ * Unlike valid tokens, error tokens:
+ *
+ * - Have no value.
+ *
+ * - Contain an extra property, `expected` with an array of tokens *that would have fixed the issue* (NOT every possible token that could be there).
+ *
+ * - The start end positions will always be equal. An invalid token has no length.
+ */
+export interface ErrorToken extends BaseToken {
+    type?: undefined;
+    value?: undefined;
+    valid: false;
+    expected: TOKEN_TYPE[];
+}
 /**
  * For more easily typing tokens that might or might not be valid.
  *
- * Using @see Token does not work well in certain situations and is also more complex because it has so many generics.
+ * Using {@link Token} does not work well in certain situations and is also more complex because it has so many generics.
+ */
+export type AnyToken<TType extends TOKEN_TYPE = TOKEN_TYPE> = ValidToken<TType> | ErrorToken;
+export type RawToken<T extends AnyToken> = Omit<T, "isToken" | "valid">;
+export type ParserResults = ExpressionNode | ConditionNode | GroupNode | ErrorToken;
+/**
+ * The base AST type all node types extend from.
+ */
+export interface Node<TType extends AST_TYPE = AST_TYPE, TValid extends boolean = boolean> {
+    isNode: true;
+    type: TType;
+    start: number;
+    end: number;
+    valid: TValid;
+}
+/**
+ * A node that symbolizes a parenthesized expression (might be negated), and if `prefixableGroups` is enabled, a prefixed expression {@link ParserOptions} .
+ *
+ * ```txt
+ * (a || b)
+ *  |----| ExpressionNode
+ * |------| GroupNode
+ *
+ * !(a || b)
+ * ^ prefix: "not" Token
+ *   |----| ExpressionNode
+ * |-------| GroupNode
+ * ```
+ *
+ * If `prefixableGroups` is enabled:
+ * ```txt
+ * prefix(a || b)
+ * |----| prefix: ConditionNode
+ *        |----| ExpressionNode
+ * |------------| GroupNode
+ *
+ * !prefix(a || b)
+ * |-----| prefix: ConditionNode
+ *         |----| ExpressionNode
+ * |-------------| GroupNode
+ *
+ * !(a || b)
+ * ^ prefix: STILL a "not" Token
+ * ```
  */
-export type AnyToken<TType extends TOKEN_TYPE = TOKEN_TYPE> = ValidToken<TType> | ErrorToken<TType>;
-export type ParserResults = ExpressionNode | ConditionNode | GroupNode | ErrorToken<TOKEN_TYPE.VALUE>;
+export interface GroupNode<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>> extends Node<AST_TYPE.GROUP> {
+    /**
+     * If the condition is negated this will contain a "not" **token**, {@link ValidToken} .
+     *
+     * If `prefixableGroups` is enabled and the group is prefixed by a **condition**, this will be an {@link ConditionNode}.
+     *
+     * **Careful:** `!(a)` here this would not be a **condition** since it's just a regular negation.
+     *
+     * See examples at {@link GroupNode} .
+     */
+    prefix: TPrefix;
+    expression: ConditionNode<TValid> | GroupNode<TValid> | ExpressionNode<TValid> | (TValid extends false ? ErrorToken : never);
+    /**
+     * The parenthesis tokens, {@link ValidToken} . These will always be defined (although not necessarily with valid tokens).
+     */
+    paren: NodeDelimiters<TOKEN_TYPE.PARENL, TOKEN_TYPE.PARENR>;
+}
+/**
+ * A variable represents **just** a string value (NOT it's boolean value).
+ *
+ * The parser will never return just a variable, they are always wrapped in an {@link ConditionNode} to give them a boolean value.
+ *
+ * A variable might or might not be quoted. If it is, the `quote` property will contain the quote tokens, see {@link ValidToken} . While they will always be of the same quote type, one might be valid while the other might not (see {@link ErrorToken}).
+ *
+ * `value` will contain the string value of the variable. The text is not processed and might still contain escaped characters (even if unquoted!) that need to be removed to get the intended value. This is so that the position of the node is accurate. {@link evaluate} will take care of unescaping when needed.
+ *
+ * If `prefixableStrings` is true, the `prefix` property might contain a value token.
+ */
+export interface VariableNode<TValid extends boolean = boolean> extends Node<AST_TYPE.VARIABLE, TValid> {
+    value: TValid extends boolean ? AnyToken<TOKEN_TYPE.VALUE> : TValid extends true ? ValidToken<TOKEN_TYPE.VALUE> : ErrorToken;
+    prefix?: ValidToken<TOKEN_TYPE.VALUE>;
+    quote?: NodeDelimiters<TokenQuoteTypes, TokenQuoteTypes>;
+}
+export interface ExpressionNode<TValid extends boolean = boolean> extends Node<AST_TYPE.EXPRESSION> {
+    operator: AnyToken<TokenBooleanTypes>;
+    left: ExpressionNode<TValid> | ConditionNode<TValid> | GroupNode<TValid> | (TValid extends false ? ErrorToken : never);
+    right: ExpressionNode<TValid> | ConditionNode<TValid> | GroupNode<TValid> | (TValid extends false ? ErrorToken : never);
+}
 export type Nodes = ExpressionNode | ConditionNode | GroupNode | VariableNode | ArrayNode;
 /**
- * Contains any delimiter tokens some AST nodes ( @see GroupNode and @see VariableNode ) can have.
+ * Contains any delimiter tokens some AST nodes ( {@link GroupNode} and {@link VariableNode} ) can have.
  *
  * These are usually not important for evaluating an expression but are useful for syntax highlighting.
  */
@@ -61,4 +178,76 @@ export type NodeDelimiters<TLEFT extends TOKEN_TYPE, TRIGHT extends TOKEN_TYPE =
     /** Only exists if regexes are enabled and this is a regex value. */
     flags?: ValidToken<TOKEN_TYPE.VALUE>;
 };
+export interface ArrayNode<TValid extends boolean = boolean> extends Node<AST_TYPE.ARRAY> {
+    values: VariableNode[];
+    bracket: NodeDelimiters<TOKEN_TYPE.BRACKETL, TOKEN_TYPE.BRACKETR>;
+    valid: TValid;
+}
+/**
+ * A condition is composed of a {@link Variable} , and, if it's negated, a "not" `operator` token, see {@link ValidToken}.
+ *
+ * The `value` property refers to the boolean value of the condition (not to the string value of the variable). See the `operator` property.
+ *
+ */
+export interface ConditionNode<TValid extends boolean = boolean> extends Node<AST_TYPE.CONDITION> {
+    /**
+     * Contains a value node which could be a variable, an array node (if enabled), or a group.
+     *
+     * Might be an error in cases like:
+     * - just passing a negation operator
+     * - if condition property operators are used and you have an input like just `[SEP]`, `op[SEP]`, `prop[SEP]op[SEP]`, `[CUSTOM OP]`, or `prop[CUSTOM OP]` where the variable is missing.
+     */
+    value: VariableNode<TValid> | ArrayNode<TValid> | GroupNode<TValid> | (TValid extends false ? ErrorToken : never);
+    /**
+     * If the condition was negated, contains the "not" token, {@link ValidToken} , the condition was negated with.
+     */
+    operator?: ValidToken<TOKEN_TYPE.NOT>;
+    /**
+     * If condition property operators are used, this will contain the property (as a variable), or an error token if it was missing (but some separator or operator was passed).
+     *
+     * While the property is a variable and can be a quoted variable, it cannot be a prefixed variable string.
+     *
+     * See the corresponding {@link ParserOptions} for more details.
+     */
+    property?: VariableNode | (TValid extends false ? ErrorToken : never);
+    /**
+     * If condition property operators are used, this will contain the operator.
+     *
+     * If a "short" form was used, this will contain an `OP_CUSTOM` type token, and the condition's `sep` will always be undefined.
+     *
+     * If a "long/expanded" form was used, this will contain a `VALUE` type token, and at least one of condition's `sep` tokens will be defined.
+     *
+     * See the corresponding {@link ParserOptions} for more details.
+     */
+    propertyOperator?: AnyToken<TOKEN_TYPE.OP_CUSTOM | TOKEN_TYPE.VALUE>;
+    /**
+     * If "long/expanded" form condition property operators are used, this will contain the separators, otherwise it is undefined.
+     *
+     * If it's defined, either both side will be valid tokens, or only the left, while the right might be undefined or an error token.
+     *
+     * This is because given a string like `[SEP]val` which would produce an error like `[MISSING PROPERTY ERROR][SEP]var`, the separator is always interpreted as being the left one. And even if we have a situation like `op[SEP]var`, it is always interpreted by the parser as `prop[SEP]var`.
+     *
+     * Why might the right be undefined instead of an error token? This is because we don't need a separator between the operator and a group, `prop[SEP]op(group)`, but we do between a variable in cases like `prop[SEP]op"var"` which would produce an error token on the right side (we could parse this but it just looks inconsistent).
+     *
+     * See the corresponding {@link ParserOptions} for more details.
+     */
+    sep?: {
+        left?: AnyToken<TOKEN_TYPE.OP_EXPANDED_SEP>;
+        right?: AnyToken<TOKEN_TYPE.OP_EXPANDED_SEP>;
+    };
+}
+export interface NormalizedCondition<TOp extends string = string, TValue = any> {
+    type: AST_TYPE.NORMALIZED_CONDITION;
+    value: TValue;
+    operator?: TOp;
+    property: string[];
+    negate: boolean;
+}
+export interface NormalizedExpression<TType extends string = string, TValue = any> {
+    type: AST_TYPE.NORMALIZED_EXPRESSION;
+    left: NormalizedExpression<TType, TValue> | NormalizedCondition<TType, TValue>;
+    right: NormalizedExpression<TType, TValue> | NormalizedCondition<TType, TValue>;
+    operator: TokenBooleanTypes;
+}
+export type ParentTypes<T extends Node | BaseToken | undefined> = T extends ValidToken ? VariableNode | GroupNode | ExpressionNode | ArrayNode | ConditionNode : T extends ErrorToken ? VariableNode | GroupNode | ExpressionNode | ArrayNode | ConditionNode : T extends GroupNode ? ExpressionNode | GroupNode | undefined : T extends VariableNode ? ConditionNode | ArrayNode | undefined : T extends ExpressionNode ? GroupNode | ExpressionNode | undefined : T extends ArrayNode ? ConditionNode | undefined : T extends ConditionNode | ExpressionNode ? GroupNode | undefined : T extends undefined ? undefined : never;
 //# sourceMappingURL=ast.d.ts.map

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

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

package/dist/types/ast.js

@@ -17,9 +17,11 @@ var TOKEN_TYPE = /* @__PURE__ */ ((TOKEN_TYPE2) => {
 })(TOKEN_TYPE || {});
 var AST_TYPE = /* @__PURE__ */ ((AST_TYPE2) => {
   AST_TYPE2["EXPRESSION"] = "EXPRESSION";
+  AST_TYPE2["NORMALIZED_EXPRESSION"] = "NORMALIZED_EXPRESSION";
   AST_TYPE2["GROUP"] = "GROUP";
   AST_TYPE2["ARRAY"] = "ARRAY";
   AST_TYPE2["CONDITION"] = "CONDITION";
+  AST_TYPE2["NORMALIZED_CONDITION"] = "NORMALIZED_CONDITION";
   AST_TYPE2["VARIABLE"] = "VARIABLE";
   return AST_TYPE2;
 })(AST_TYPE || {});

package/dist/types/autocomplete.d.ts

@@ -1,12 +1,11 @@
-import type { AnyToken, Position } from "./ast.js";
-import type { ValidToken } from "../ast/classes/ValidToken.js";
+import type { AnyToken, Position, ValidToken } from "./ast.js";
 /**
- * Contains information regarding the tokens around a cursor position. Mostly for internally use by @see autosuggest.
+ * Contains information regarding the tokens around a cursor position. Mostly for internally use by {@link autosuggest}.
  *
  * Notes:
  *
- * - There are no whitespace tokens because whitespace is not tokenized. `prev`, `at`, `next` properties that contain tokens are set looking only at the list of tokens extracted from the ast by @see extractTokens. This is why there is an extra `whitespace` property to tell us whether there is whitespace (i.e. a hole) between the cursor and the next/prev **valid** tokens or if it can't find any, the start/end of the input.
- * - If next/prev are invalid tokens, note that there are cases where more invalid tokens might follow them. To get them we can use @see getSurroundingErrors or we can just find their index in the tokens list and go forward/backward as needed:
+ * - There are no whitespace tokens because whitespace is not tokenized. `prev`, `at`, `next` properties that contain tokens are set looking only at the list of tokens extracted from the ast by {@link extractTokens}. This is why there is an extra `whitespace` property to tell us whether there is whitespace (i.e. a hole) between the cursor and the next/prev **valid** tokens or if it can't find any, the start/end of the input.
+ * - If next/prev are invalid tokens, note that there are cases where more invalid tokens might follow them. To get them we can use {@link getSurroundingErrors} or we can just find their index in the tokens list and go forward/backward as needed:
  * ```ts
  * let i =  tokens.findIndex(t => t === info.next)
  * while (tokens[i] instanceof ErrorToken) {...}
@@ -107,7 +106,7 @@ export type Suggestion = {
     type: SUGGESTION_TYPE;
     /** The range the suggestion should replace / be inserted at. */
     range: Position;
-    /** @see CursorInfo */
+    /** {@link CursorInfo} */
     cursorInfo: CursorInfo;
     /** Tells us any additional requirements for inserting the suggestion. */
     requires: {

package/dist/types/autocomplete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autocomplete.d.ts","sourceRoot":"","sources":["../../src/types/autocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAG9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,EAAE,MAAM,CAAA;IACb;;;;OAIG;IACH,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,qFAAqF;IACrF,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,sGAAsG;IACtG,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,4BAA4B;IAC5B,KAAK,EAAE;QACN,gCAAgC;QAChC,IAAI,CAAC,EAAE,UAAU,CAAA;QACjB,gCAAgC;QAChC,IAAI,CAAC,EAAE,UAAU,CAAA;KACjB,CAAA;IACD,+GAA+G;IAC/G,UAAU,EAAE;QACX,uGAAuG;QACvG,IAAI,EAAE,OAAO,CAAA;QACb,yGAAyG;QACzG,IAAI,EAAE,OAAO,CAAA;KACb,CAAA;CACD,CAAA;AAED,oBAAY,eAAe;IAE1B,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,0BAA0B,+BAA+B;IACzD,wBAAwB,6BAA6B;IACrD,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,WAAW,gBAAgB;CAG3B;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,eAAe,CAAA;IACrB,gEAAgE;IAChE,KAAK,EAAE,QAAQ,CAAA;IACf,sBAAsB;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,yEAAyE;IACzE,QAAQ,EAAE;QACT;;;;WAIG;QACH,UAAU,EAAE;YACX,KAAK,EAAE,OAAO,CAAA;YACd,MAAM,EAAE,OAAO,CAAA;SACf,CAAA;QACD;;;;;;WAMG;QACH,KAAK,EAAE,OAAO,CAAA;QACd,6OAA6O;QAC7O,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;KACtB,CAAA;IACD;;OAEG;IACH,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAGD,MAAM,MAAM,UAAU,GAAG;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;CACb,CAAA"}
+{"version":3,"file":"autocomplete.d.ts","sourceRoot":"","sources":["../../src/types/autocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAG9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,EAAE,MAAM,CAAA;IACb;;;;OAIG;IACH,EAAE,CAAC,EAAE,UAAU,CAAA;IACf,qFAAqF;IACrF,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,sGAAsG;IACtG,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,4BAA4B;IAC5B,KAAK,EAAE;QACN,gCAAgC;QAChC,IAAI,CAAC,EAAE,UAAU,CAAA;QACjB,gCAAgC;QAChC,IAAI,CAAC,EAAE,UAAU,CAAA;KACjB,CAAA;IACD,+GAA+G;IAC/G,UAAU,EAAE;QACX,uGAAuG;QACvG,IAAI,EAAE,OAAO,CAAA;QACb,yGAAyG;QACzG,IAAI,EAAE,OAAO,CAAA;KACb,CAAA;CACD,CAAA;AAED,oBAAY,eAAe;IAE1B,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,0BAA0B,+BAA+B;IACzD,wBAAwB,6BAA6B;IACrD,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,WAAW,gBAAgB;CAG3B;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,eAAe,CAAA;IACrB,gEAAgE;IAChE,KAAK,EAAE,QAAQ,CAAA;IACf,yBAAyB;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,yEAAyE;IACzE,QAAQ,EAAE;QACT;;;;WAIG;QACH,UAAU,EAAE;YACX,KAAK,EAAE,OAAO,CAAA;YACd,MAAM,EAAE,OAAO,CAAA;SACf,CAAA;QACD;;;;;;WAMG;QACH,KAAK,EAAE,OAAO,CAAA;QACd,6OAA6O;QAC7O,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;KACtB,CAAA;IACD;;OAEG;IACH,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAGD,MAAM,MAAM,UAAU,GAAG;IACxB,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;CACb,CAAA"}

package/dist/types/parser.d.ts

@@ -1,10 +1,5 @@
 import type { DeepRequired, MakeRequired } from "@alanscodelog/utils/types";
-import type { Position, TOKEN_TYPE } from "./ast.js";
-import type { ArrayNode } from "../ast/classes/ArrayNode.js";
-import type { Condition } from "../ast/classes/Condition.js";
-import type { ConditionNode } from "../ast/classes/ConditionNode.js";
-import type { ValidToken } from "../ast/classes/ValidToken.js";
-import type { VariableNode } from "../ast/classes/VariableNode.js";
+import type { ArrayNode, ConditionNode, NormalizedCondition, Position, TOKEN_TYPE, ValidToken, VariableNode } from "./ast.js";
 export type FullParserOptions<T extends {} = {}> = MakeRequired<ParserOptions<T>, Exclude<keyof ParserOptions<T>, "prefixableStrings" | "expandedPropertySeparator" | "customPropertyOperators" | "keywords">> & {
     keywords: DeepRequired<KeywordOptions>;
 };
@@ -16,14 +11,14 @@ export type ParserOptions<T extends {} = {}> = {
      * ```js
      * category.subcategory.(variable1 || variable2 && !variable3)
      * ```
-     * returns an @see GroupNode whose prefix is a value token with the value `category.subcategory.`
+     * returns an {@link GroupNode} whose prefix is a value token with the value `category.subcategory.`
      *
-     * This prefix can later be applied by utility functions when evaluating the expression or extracting information from it. The default @see PrefixApplier appends the prefix name to every variable inside the group, so the above would expand into something like:
+     * This prefix can later be applied by utility functions when evaluating the expression or extracting information from it. The default {@link PrefixApplier} appends the prefix name to every variable inside the group, so the above would expand into something like:
      * ```js
      * category.subcategory.variable1 || category.subcategory.variable2 || !category.subcategory.variable3
      * ```
      *
-     * @see UtilityOptions["prefixApplier"] for more examples and details on how to customize the behavior.
+     * {@link UtilityOptions}["prefixApplier"] for more examples and details on how to customize the behavior.
      */
     prefixableGroups?: boolean;
     /**
@@ -46,11 +41,11 @@ export type ParserOptions<T extends {} = {}> = {
      * title:contains(value)
      * ```
      *
-     * The information for these types of conditions are stored in a @see ConditionNode 's `property`, `propertyOperator`, and `sep` properties.
+     * The information for these types of conditions are stored in a {@link ConditionNode} 's `property`, `propertyOperator`, and `sep` properties.
      *
      * The separator can only be one character long and is added to the list of characters that need to be escaped.
      *
-     * The property is always a @see VariableNode and can be a quoted variable, but it can never be a prefixed string (if using `prefixableStrings`).
+     * The property is always a {@link VariableNode} and can be a quoted variable, but it can never be a prefixed string (if using `prefixableStrings`).
      * ```
      */
     expandedPropertySeparator?: string;
@@ -81,7 +76,7 @@ export type ParserOptions<T extends {} = {}> = {
      * title:(prefix(a OR B)) // title:prefix.a OR title:prefix.b
      * ```
      *
-     * Like expanded property operators, these are stored in the @see ConditionNode 's `property`, `propertyOperator` properties. `sep` is not used, not even if the the same operator as the `expandedPropertySeparator` is used. This is what is meant by these types of operators taking priority. If used in this short style, it will always be interpreted as a `propertyOperator`.
+     * Like expanded property operators, these are stored in the {@link ConditionNode} 's `property`, `propertyOperator` properties. `sep` is not used, not even if the the same operator as the `expandedPropertySeparator` is used. This is what is meant by these types of operators taking priority. If used in this short style, it will always be interpreted as a `propertyOperator`.
      *
      */
     customPropertyOperators?: string[];
@@ -176,9 +171,9 @@ export type ParserOptions<T extends {} = {}> = {
      */
     keywords?: KeywordOptions;
     /**
-     * If prefixableGroups is true, this allows you to control how a prefix is applied for any methods that need to apply them (e.g. @see extractVariables @see evaluate).
+     * If prefixableGroups is true, this allows you to control how a prefix is applied for any methods that need to apply them (e.g. {@link extractVariables} {@link evaluate}).
      *
-     * The default @see PrefixApplier function just appends the prefix.
+     * The default {@link PrefixApplier} function just appends the prefix.
      *
      * So for example:
      *
@@ -253,7 +248,7 @@ export type ParserOptions<T extends {} = {}> = {
     /**
      * When evaluating an ast against a context, this function determines whether a context value satisfies a condition.
      *
-     * Given a partial {@link Condition} instance (negate property is not passed) and the contextValue (as extracted using {@link Condition.property}), it should return whether the values are equal.
+     * Given a partial {@link NormalizedCondition} instance (negate property is not passed) and the contextValue (as extracted using {@link NormalizedCondition.property}), it should return whether the values are equal.
      *
      * It is also passed the context itself for cases where there is no property and you might want to check the value against all properties of the context.
      *
@@ -278,7 +273,7 @@ export type ParserOptions<T extends {} = {}> = {
     /**
      * When {@link Parser.normalize normalizing} an ast, this function is needed to determine what exactly the value and operator of the condition is and whether it should be negated when evaluating.
      *
-     * Given a query object it should return the values of the `value`, `operator`, and `negate` properties that will be assigned to {@link Condition}.
+     * Given a query object it should return the values of the `value`, `operator`, and `negate` properties that will be assigned to {@link NormalizedCondition}.
      *
      * You can think of the query object as a simplified version of the condition node. See {@link ValueQuery} for details on each property.
      *
@@ -333,7 +328,7 @@ export type ParserOptions<T extends {} = {}> = {
      */
     conditionNormalizer?: ConditionNormalizer;
     /**
-     * Similar to the valueComparer but for validating the ast before it's evaluated using @see Parser["validate"] (e.g. for syntax highlighting purposes). For the moment the ast must be valid (without syntax errors) to be validated.
+     * Similar to the valueComparer but for validating the ast before it's evaluated using {@link Parser}["validate"] (e.g. for syntax highlighting purposes). For the moment the ast must be valid (without syntax errors) to be validated.
      *
      * The only difference is nothing is actually evaluated (even though the values are available to the function\*) and the query contains the actual nodes/tokens for certain properties to make extracting positions easier.
      *
@@ -417,23 +412,23 @@ export type ValueQuery = {
     /** If the operator is an expanded operator. */
     isExpanded: boolean;
 };
-/** @see ParserOptions["valueValidator"] */
+/** {@link ParserOptions}["valueValidator"] */
 export type ValidationQuery = Omit<ValueQuery, "value" | "operator" | "prefix" | "regexFlags" | "property"> & {
     value?: VariableNode | ArrayNode;
     operator?: ValidToken<TOKEN_TYPE.VALUE | TOKEN_TYPE.OP_CUSTOM>;
     prefix?: ValidToken<TOKEN_TYPE.VALUE>;
     regexFlags?: ValidToken<TOKEN_TYPE.VALUE>;
     property: VariableNode[];
-    /** The property as would be passed to the @see ParserOptions["valueComparer"] function (i.e. joined as a string using the @see ParseOptions["prefixApplier"] ) */
+    /** The property as would be passed to the {@link ParserOptions}["valueComparer"] function (i.e. joined as a string using the {@link ParseOptions}["prefixApplier"] ) */
     propertyName?: string;
-    /** The property keys, as parsed by @see ParserOptions["keysParser"] */
+    /** The property keys, as parsed by {@link ParserOptions}["keysParser"] */
     propertyKeys: string[];
     /**
      * Contains a list of all the wrapping group prefix nodes.
      */
     prefixes?: VariableNode[];
 };
-export type ValueComparer = (condition: Omit<Condition, "negate">, contextValue: any, context: any) => boolean;
+export type ValueComparer = (condition: Omit<NormalizedCondition, "negate">, contextValue: any, context: any) => boolean;
 export type ConditionNormalizer = (query: ValueQuery) => {
     value: any;
     operator: any;
@@ -443,7 +438,7 @@ export type ValueValidator<T = Record<string, any>> = (contextValue: any | undef
 export type KeyParser = (key: string) => string[];
 export type PrefixApplier = (prefix: string, variable: string) => string;
 export type KeywordEntry = {
-    /** See @see ParserOptions["KeywordOptions"] */
+    /** See {@link ParserOptions}["KeywordOptions"] */
     isSymbol: boolean;
     value: string;
 };

package/dist/types/parser.d.ts.map

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

package/dist/utils/extractTokens.d.ts

@@ -1,8 +1,6 @@
-import { ErrorToken } from "../ast/classes/ErrorToken.js";
-import { Node } from "../ast/classes/Node.js";
-import type { AnyToken, AST_TYPE } from "../types/ast.js";
+import { type AnyToken, type ErrorToken, type Nodes } from "../types/ast.js";
 /**
  * Extract a list of all the tokens (which might or might not be valid).
  */
-export declare function extractTokens(ast: Node<AST_TYPE> | ErrorToken): AnyToken[];
+export declare function extractTokens(ast: ErrorToken | Nodes): AnyToken[];
 //# sourceMappingURL=extractTokens.d.ts.map

package/dist/utils/extractTokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractTokens.d.ts","sourceRoot":"","sources":["../../src/utils/extractTokens.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAGzD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAGzD;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,UAAU,GAAG,QAAQ,EAAE,CAmD1E"}
+{"version":3,"file":"extractTokens.d.ts","sourceRoot":"","sources":["../../src/utils/extractTokens.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,QAAQ,EAAY,KAAK,UAAU,EAAE,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAGtF;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,KAAK,GAAG,QAAQ,EAAE,CAmDjE"}

package/dist/utils/extractTokens.js

@@ -1,25 +1,21 @@
 import { unreachable } from "@alanscodelog/utils/unreachable.js";
-import { ArrayNode } from "../ast/classes/ArrayNode.js";
-import { ConditionNode } from "../ast/classes/ConditionNode.js";
-import { ErrorToken } from "../ast/classes/ErrorToken.js";
-import { ExpressionNode } from "../ast/classes/ExpressionNode.js";
-import { GroupNode } from "../ast/classes/GroupNode.js";
-import { Node } from "../ast/classes/Node.js";
-import { VariableNode } from "../ast/classes/VariableNode.js";
+import { isNode } from "./isNode.js";
+import { isToken } from "./isToken.js";
+import { AST_TYPE } from "../types/ast.js";
 function extractTokens(ast) {
   var _a, _b, _c;
-  if (ast instanceof ErrorToken) {
+  if (isToken(ast) && !ast.valid) {
     return [ast];
   }
-  if (ast instanceof VariableNode) {
+  if (ast.type === AST_TYPE.VARIABLE) {
     const prefix = ast.prefix ? [ast.prefix] : [];
     const quoteR = ast.quote ? [ast.quote.right] : [];
     const quoteL = ast.quote ? [ast.quote.left] : [];
     const quoteFlags = ((_a = ast.quote) == null ? void 0 : _a.flags) ? [ast.quote.flags] : [];
     return [...prefix, ...quoteL, ast.value, ...quoteR, ...quoteFlags];
   }
-  if (ast instanceof ConditionNode) {
-    const value = ast.value instanceof Node ? extractTokens(ast.value) : [ast.value];
+  if (ast.type === AST_TYPE.CONDITION) {
+    const value = isNode(ast.value) ? extractTokens(ast.value) : [ast.value];
     const operator = ast.operator ? [ast.operator] : [];
     const property = ast.property ? extractTokens(ast.property) : [];
     const propertyOperator = ast.propertyOperator ? [ast.propertyOperator] : [];
@@ -27,20 +23,20 @@ function extractTokens(ast) {
     const sepR = ((_c = ast.sep) == null ? void 0 : _c.right) ? [ast.sep.right] : [];
     return [...operator, ...property, ...sepL, ...propertyOperator, ...sepR, ...value];
   }
-  if (ast instanceof GroupNode) {
-    const prefix = ast.prefix ? ast.prefix instanceof Node ? extractTokens(ast.prefix) : [ast.prefix] : [];
+  if (ast.type === AST_TYPE.GROUP) {
+    const prefix = ast.prefix ? isNode(ast.prefix) ? extractTokens(ast.prefix) : [ast.prefix] : [];
     const parenL = ast.paren ? [ast.paren.left] : [];
     const parenR = ast.paren ? [ast.paren.right] : [];
-    const expression = ast.expression instanceof Node ? extractTokens(ast.expression) : [ast.expression];
+    const expression = isNode(ast.expression) ? extractTokens(ast.expression) : [ast.expression];
     return [...prefix, ...parenL, ...expression, ...parenR];
   }
-  if (ast instanceof ArrayNode) {
+  if (ast.type === AST_TYPE.ARRAY) {
     const values = ast.values.map((val) => extractTokens(val));
     return [ast.bracket.left, ...values.flat(), ast.bracket.right];
   }
-  if (ast instanceof ExpressionNode) {
-    const right = ast.right instanceof Node ? extractTokens(ast.right) : [ast.right];
-    const left = ast.left instanceof Node ? extractTokens(ast.left) : [ast.left];
+  if (ast.type === AST_TYPE.EXPRESSION) {
+    const right = isNode(ast.right) ? extractTokens(ast.right) : [ast.right];
+    const left = isNode(ast.left) ? extractTokens(ast.left) : [ast.left];
     return [...left, ast.operator, ...right];
   }
   return unreachable();

package/dist/utils/generateParentsMap.d.ts

@@ -0,0 +1,10 @@
+import { type AnyToken, type Nodes } from "../types/ast.js";
+/**
+ * Creates a map like Map<Node, Parent>, for easily accessing parents of nodes.
+ *
+ * This is done like this to avoid having circular structures in the ast.
+ *
+ * To get a properly typed parent, use {@link getParent} which you will need to pass a generated map.
+ */
+export declare function generateParentsMap(ast: Nodes | AnyToken): Map<Nodes | AnyToken, Nodes>;
+//# sourceMappingURL=generateParentsMap.d.ts.map

package/dist/utils/generateParentsMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateParentsMap.d.ts","sourceRoot":"","sources":["../../src/utils/generateParentsMap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,QAAQ,EAAY,KAAK,KAAK,EAAG,MAAM,iBAAiB,CAAA;AAEtE;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,KAAK,GAAG,QAAQ,GAAG,GAAG,CAAC,KAAK,GAAG,QAAQ,EAAE,KAAK,CAAC,CA8CtF"}

package/dist/utils/generateParentsMap.js

@@ -0,0 +1,73 @@
+import "@alanscodelog/utils/types";
+import { isNode } from "./isNode.js";
+import { AST_TYPE } from "../types/ast.js";
+function generateParentsMap(ast) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const recursiveMap = arguments[1];
+  const map = recursiveMap ?? /* @__PURE__ */ new Map();
+  const self = generateParentsMap;
+  if (ast.type === AST_TYPE.VARIABLE) {
+    if (ast.prefix)
+      map.set(ast.prefix, ast);
+    if ((_a = ast.quote) == null ? void 0 : _a.left)
+      map.set(ast.quote.left, ast);
+    if ((_b = ast.quote) == null ? void 0 : _b.right)
+      map.set(ast.quote.right, ast);
+    if ((_c = ast.quote) == null ? void 0 : _c.flags)
+      map.set(ast.quote.flags, ast);
+    map.set(ast.value, ast);
+  } else if (ast.type === AST_TYPE.CONDITION) {
+    if (ast.operator)
+      map.set(ast.operator, ast);
+    if (ast.property) {
+      map.set(ast.property, ast);
+      if (isNode(ast.property))
+        self(ast.property, map);
+    }
+    if (ast.propertyOperator)
+      map.set(ast.propertyOperator, ast);
+    if ((_d = ast.sep) == null ? void 0 : _d.left)
+      map.set(ast.sep.left, ast);
+    if ((_e = ast.sep) == null ? void 0 : _e.right)
+      map.set(ast.sep.right, ast);
+    map.set(ast.value, ast);
+    if (isNode(ast.value))
+      self(ast.value, map);
+  } else if (ast.type === AST_TYPE.EXPRESSION) {
+    if (ast.operator)
+      map.set(ast.operator, ast);
+    map.set(ast.right, ast);
+    if (isNode(ast.right))
+      self(ast.right, map);
+    map.set(ast.left, ast);
+    if (isNode(ast.left))
+      self(ast.left, map);
+  } else if (ast.type === AST_TYPE.GROUP) {
+    if (ast.prefix) {
+      map.set(ast.prefix, ast);
+      if (isNode(ast.prefix))
+        self(ast.prefix, map);
+    }
+    if ((_f = ast.paren) == null ? void 0 : _f.left)
+      map.set(ast.paren.left, ast);
+    if ((_g = ast.paren) == null ? void 0 : _g.right)
+      map.set(ast.paren.right, ast);
+    map.set(ast.expression, ast);
+    if (isNode(ast.expression))
+      self(ast.expression, map);
+  } else if (ast.type === AST_TYPE.ARRAY) {
+    if (ast.bracket.left)
+      map.set(ast.bracket.left, ast);
+    if (ast.bracket.right)
+      map.set(ast.bracket.right, ast);
+    for (const val of ast.values) {
+      map.set(val, ast);
+      if (isNode(val))
+        self(val, map);
+    }
+  }
+  return map;
+}
+export {
+  generateParentsMap
+};

package/dist/utils/getCursorInfo.d.ts

@@ -1,7 +1,7 @@
 import { type AnyToken, type ParserResults } from "../types/ast.js";
 import { type CursorInfo } from "../types/autocomplete.js";
 /**
- * Returns a @see CursorInfo object, see it for details.
+ * Returns a {@link CursorInfo} object, see it for details.
  */
 export declare function getCursorInfo(input: string, ast: ParserResults | AnyToken[], index: number): CursorInfo;
 //# sourceMappingURL=getCursorInfo.d.ts.map