@witchcraft/expressit 0.0.2 → 0.1.0

package/src/ast/builders/array.ts

@@ -1,4 +1,4 @@
-import type { Mutable } from "@alanscodelog/utils"
+import type { Mutable } from "@alanscodelog/utils/types"
 
 import { token } from "./token.js"
 
@@ -11,7 +11,7 @@ export function array(
 	values: VariableNode[],
 	bracket: { left?: boolean, right?: boolean } = { right: true, left: true },
 	parenLeftPos?: Position,
-	parenRightPos?: Position
+	parenRightPos?: Position,
 ): ArrayNode {
 	const node: Mutable<Partial<ArrayNode>> = {
 		type: AST_TYPE.ARRAY,

package/src/ast/builders/condition.ts

@@ -29,7 +29,7 @@ export function condition(
 	not: true | ValidToken<TOKEN_TYPE.NOT> = true,
 	property?: VariableNode | ErrorToken<TOKEN_TYPE.VALUE>,
 	propertyOperator?: AnyToken<TOKEN_TYPE.OP_CUSTOM | TOKEN_TYPE.VALUE>,
-	{ right, left }: Partial<Record<"right" | "left", ValidToken<TOKEN_TYPE.OP_EXPANDED_SEP>>> = { }
+	{ right, left }: Partial<Record<"right" | "left", ValidToken<TOKEN_TYPE.OP_EXPANDED_SEP>>> = { },
 ): ConditionNode {
 	const position = pos(value satisfies Position)
 	const notStart = not === true ? undefined : not.start

package/src/ast/builders/expression.ts

@@ -28,7 +28,7 @@ export function expression(
 	ExpressionNode |
 	GroupNode |
 	ErrorToken<TOKEN_TYPE.VALUE> |
-	undefined
+	undefined,
 ): ExpressionNode {
 	const start =
 		left?.start ??

package/src/ast/builders/group.ts

@@ -32,7 +32,7 @@ export function group(
 
 	paren: { left?: boolean, right?: boolean } = { right: true, left: true },
 	parenLeftPos?: Position,
-	parenRightPos?: Position
+	parenRightPos?: Position,
 ): GroupNode {
 	if (expression === undefined) {
 		expression = token(TOKEN_TYPE.VALUE, undefined, prefix?.end !== undefined ? { start: prefix.end } : undefined)

package/src/ast/builders/index.ts

@@ -1,4 +1,4 @@
-/* Autogenerated Index */
+/* Autogenerated Index [Ignore] */
 
 export { array } from "./array.js"
 export { condition } from "./condition.js"

package/src/ast/builders/pos.ts

@@ -31,7 +31,7 @@ export function pos<TItem extends Position | Partial<Position> | EmptyObj>(
 export function pos(start: number, end: number): Position
 export function pos(
 	start: number | Position | Partial<Position> | EmptyObj | undefined,
-	end?: number | { fill: boolean }
+	end?: number | { fill: boolean },
 ): Position | EmptyObj {
 	if (typeof start === "number") {
 		return { start, end: end as number }

package/src/ast/builders/token.ts

@@ -1,4 +1,4 @@
-import { isArray } from "@alanscodelog/utils"
+import { isArray } from "@alanscodelog/utils/isArray"
 
 import { pos } from "./pos.js"
 
@@ -21,7 +21,7 @@ export function token<
 >(
 	type: TValue extends undefined ? TType | TType[] : TType,
 	value: TValue,
-	position: Position | Partial<Position> | EmptyObj = {}
+	position: Position | Partial<Position> | EmptyObj = {},
 ): TValue extends undefined
 	? ErrorToken<TType>
 	: ValidToken<TType> {

package/src/ast/builders/type.ts

@@ -3,7 +3,7 @@ import { type ExtractTokenType, TOKEN_TYPE } from "../../types/ast.js"
  * Given a the string value of an operator or single delimiter token, returns the corresponding @see ValidToken_TYPE .
  */
 export function type<T extends string>(
-	operatorSymbol: T
+	operatorSymbol: T,
 ): ExtractTokenType<T> {
 	switch (operatorSymbol) {
 		case "`": return TOKEN_TYPE.BACKTICK as any

package/src/ast/builders/variable.ts

@@ -18,7 +18,7 @@ export function variable(
 	prefix: ValidToken<TOKEN_TYPE.VALUE> | undefined,
 	value: string | AnyToken<TOKEN_TYPE.VALUE>,
 	quote?: { type: TokenQuoteTypes, left?: boolean, right?: boolean, flags?: string },
-	position?: Position | EmptyObj
+	position?: Position | EmptyObj,
 ): VariableNode {
 	if (typeof value === "string") {
 		value = token(TOKEN_TYPE.VALUE, value, position)

package/src/ast/classes/ConditionNode.ts

@@ -86,7 +86,7 @@ export class ConditionNode<
 
 	set parent(value: GroupNode |
 	ExpressionNode |
-	undefined
+	undefined,
 	) {
 		if (this.#setParent) {throw new Error("parent property is readonly")}
 		this.#parent = value

package/src/ast/classes/ErrorToken.ts

@@ -32,7 +32,7 @@ export class ErrorToken<
 	set parent(value: VariableNode |
 	GroupNode |
 	ExpressionNode |
-	ConditionNode
+	ConditionNode,
 	) {
 		if (this.#parent) {throw new Error("parent property is readonly")}
 		this.#parent = value

package/src/ast/classes/ValidToken.ts

@@ -36,7 +36,7 @@ export class ValidToken<
 	| GroupNode
 	| ExpressionNode
 	| ConditionNode
-	| ArrayNode
+	| ArrayNode,
 	) {
 		if (this.#parent) {throw new Error("parent property is readonly")}
 		this.#parent = value
@@ -47,7 +47,7 @@ export class ValidToken<
 		value: string
 		start: number
 		end: number
-	}
+	},
 	) {
 		super(start, end)
 		this.type = type

package/src/ast/classes/index.ts

@@ -1,4 +1,4 @@
-/* Autogenerated Index */
+/* Autogenerated Index [Ignore] */
 
 export { ArrayNode } from "./ArrayNode.js"
 export { Condition } from "./Condition.js"

package/src/ast/handlers.ts

@@ -29,11 +29,11 @@ const delimiters = <T extends TokenDelimiterTypes>
 		// check must be falsy, we want to return undefined when given ""
 		value ? new ValidToken({ value, type, ...pos }) : undefined
 
-const maybeToken = <T extends TOKEN_TYPE>(type: T) => (value: string | undefined, pos: Position,): AnyToken<T> => {
+const maybeToken = <T extends TOKEN_TYPE> (type: T) => <TVal extends string | undefined> (value: TVal, pos: Position): TVal extends string ? ValidToken<T> : ErrorToken<T> => {
 	if (value === undefined) {
-		return error(pos.end, [type])
+		return error(pos.end, [type]) as any
 	} else {
-		return new ValidToken({ value, type, ...pos })
+		return new ValidToken({ value, type, ...pos }) as any
 	}
 }
 
@@ -68,7 +68,7 @@ export function variable(
 	quoteL: AnyToken<TokenQuoteTypes> | null | undefined,
 	value: AnyToken<TOKEN_TYPE.VALUE> | null | undefined,
 	quoteR: AnyToken<TokenQuoteTypes> | null | undefined,
-	flags?: ValidToken<TOKEN_TYPE.VALUE>
+	flags?: ValidToken<TOKEN_TYPE.VALUE>,
 ): VariableNode {
 	const node: FirstConstructorParam<typeof VariableNode> = {
 		prefix: prefix ?? undefined,
@@ -152,7 +152,7 @@ export function group(
 	prefix: ConditionNode | null | undefined,
 	parenL: ValidToken<TOKEN_TYPE.PARENL> | null | undefined,
 	condition: GroupNode["expression"],
-	parenR: ValidToken<TOKEN_TYPE.PARENR> | null | undefined
+	parenR: ValidToken<TOKEN_TYPE.PARENR> | null | undefined,
 ): GroupNode {
 	const node: FirstConstructorParam<typeof GroupNode> = {
 		prefix: prefix ?? operator ?? undefined,
@@ -172,7 +172,7 @@ export function group(
 export function array(
 	bracketL: ValidToken<TOKEN_TYPE.BRACKETL>,
 	values: VariableNode[],
-	bracketR: ValidToken<TOKEN_TYPE.BRACKETR> | null | undefined
+	bracketR: ValidToken<TOKEN_TYPE.BRACKETR> | null | undefined,
 ): ArrayNode {
 	const node: FirstConstructorParam<typeof ArrayNode> = {
 		values,

package/src/ast/index.ts

@@ -1,5 +1,5 @@
-/* Autogenerated Index */
-
 export * as builders from "./builders/index.js"
 export * as classes from "./classes/index.js"
+/* Autogenerated Index */
+
 export { token } from "./handlers.js"

package/src/examples/index.ts

@@ -0,0 +1,3 @@
+/* Autogenerated Index */
+
+export { ShortcutContextParser } from "./shortcutContextParser.js"

package/src/examples/shortcutContextParser.ts

@@ -9,7 +9,7 @@
  * The validate function will return a list of positions with a list of errors which includes handling invalid or duplicate regex flags.
  */
 
-import { Parser } from "../parser.js"
+import { Parser } from "../Parser.js"
 import type { Position } from "../types/ast.js"
 import type { ValueQuery } from "../types/parser.js"
 
@@ -24,7 +24,7 @@ export class ShortcutContextParser<T extends
 
 	constructor(
 		dummyContext: Record<string, any>,
-		validRegexFlags: string[] = ["i", "u", "m"]
+		validRegexFlags: string[] = ["i", "u", "m"],
 	) {
 		super({
 			arrayValues: false,
@@ -43,11 +43,11 @@ export class ShortcutContextParser<T extends
 				}
 				return prefix + variable
 			},
-			valueComparer: (_condition, contextValue, query) => {
-				if (query.isRegex) {
-					return contextValue.match(new RegExp(query.value as string, query.regexFlags ?? "")) !== null
+			valueComparer: (condition, contextValue, _context) => {
+				if (condition.value instanceof RegExp) {
+					return contextValue.match(condition.value) !== null
 				}
-				return contextValue === query.value
+				return contextValue === condition.value
 			},
 			valueValidator: (_contextValue, query): T[] | void => {
 				let tokens: T[] = []
@@ -123,6 +123,11 @@ export class ShortcutContextParser<T extends
 		this._extractKeysFromContext(dummyContext)
 	}
 
+	setContext(context: Record<string, any>): void {
+		this.validKeys = []
+		this._extractKeysFromContext(context)
+	}
+
 	private _extractKeysFromContext(context: Record<string, any>, prev?: string): void {
 		for (const key of Object.keys(context)) {
 			if (typeof context[key] === "boolean") {

package/src/helpers/errors.ts

@@ -1,5 +1,7 @@
-import type { Keys } from "@alanscodelog/utils"
-import { crop, indent, pretty } from "@alanscodelog/utils"
+import { crop } from "@alanscodelog/utils/crop"
+import { indent } from "@alanscodelog/utils/indent"
+import { pretty } from "@alanscodelog/utils/pretty"
+import type { Keys } from "@alanscodelog/utils/types"
 
 // @ts-expect-error todo
 import { repository, version } from "../package.js"
@@ -38,7 +40,7 @@ function forceStringifyErrors(_key: string, value: any): any {
 					key === "stack"
 						? value[key]!.split(/\n/)
 						: value[key],
-				])
+				]),
 		)
 	}
 	return value

package/src/helpers/general/defaultConditionNormalizer.ts

@@ -3,7 +3,7 @@ import type { ConditionNormalizer, ValueQuery } from "../../types/parser.js"
 
 export const defaultConditionNormalizer: ConditionNormalizer =
 function defaultConditionNormalizer(
-	{ value, operator, isNegated }: Pick<ValueQuery, "value" | "operator" | "isNegated">
+	{ value, operator, isNegated }: Pick<ValueQuery, "value" | "operator" | "isNegated">,
 ) {
 	return { value, operator, negate: isNegated }
 }

package/src/helpers/general/index.ts

@@ -1,4 +1,4 @@
-/* Autogenerated Index */
+/* Autogenerated Index [Ignore] */
 
 export { applyBoolean } from "./applyBoolean.js"
 export { applyPrefix } from "./applyPrefix.js"

package/src/helpers/index.ts

@@ -1,5 +1,6 @@
-/* Autogenerated Index [Ignore] */
-
 export * as general from "./general/index.js"
 export * as parser from "./parser/index.js"
+
+/* Autogenerated Index [Ignore] */
+
 export { BooleanParserLibraryError } from "./errors.js"

package/src/helpers/parser/checkParserOpts.ts

@@ -1,4 +1,5 @@
-import { isBlank, pushIfNotIn } from "@alanscodelog/utils"
+import { isBlank } from "@alanscodelog/utils/isBlank"
+import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn"
 
 import { ERROR_CODES } from "../../types/errors.js"
 import type { FullParserOptions, ParserOptions } from "../../types/parser.js"
@@ -19,7 +20,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		]
 		const extra: string[] = []
 		if (opts.expandedPropertySeparator) extra.push(opts.expandedPropertySeparator)
-		if (opts.customPropertyOperators) pushIfNotIn(extra, ...opts.customPropertyOperators)
+		if (opts.customPropertyOperators) pushIfNotIn(extra, opts.customPropertyOperators)
 
 
 		/* #region Blank Operator Checks */
@@ -27,7 +28,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: [""], invalid: opts.expandedPropertySeparator },
-			`expandedPropertySeparator cannot be blank`
+			`expandedPropertySeparator cannot be blank`,
 			)
 		}
 		const customInvalid = opts.customPropertyOperators?.find(_ => isBlank(_))
@@ -35,7 +36,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: [""], invalid: customInvalid },
-			`customPropertyOperators cannot contain blank entries`
+			`customPropertyOperators cannot contain blank entries`,
 			)
 		}
 		const prefixInvalid = opts.prefixableStrings?.find(_ => isBlank(_))
@@ -43,7 +44,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: [""], invalid: prefixInvalid },
-			`prefixableStrings cannot contain blank entries`
+			`prefixableStrings cannot contain blank entries`,
 			)
 		}
 		for (const key of ["and", "or", "not"]) {
@@ -54,7 +55,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 				throw new BooleanParserLibraryError(
 					ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 					{ prohibited: [""], invalid },
-				`keywords.${key} cannot contain entries with blank values`
+				`keywords.${key} cannot contain entries with blank values`,
 				)
 			}
 		}
@@ -77,7 +78,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: all, invalid: invalidPrefixableString },
-			`prefixableStrings ${messageInvalidAny} "${invalidPrefixableString}"`
+			`prefixableStrings ${messageInvalidAny} "${invalidPrefixableString}"`,
 			)
 		}
 
@@ -87,7 +88,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: allKeywords, invalid: invalidExpandedPropertySeparator },
-			`expandedPropertySeparator ${messageInvalidBool} "${invalidExpandedPropertySeparator}"`
+			`expandedPropertySeparator ${messageInvalidBool} "${invalidExpandedPropertySeparator}"`,
 			)
 		}
 
@@ -98,7 +99,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: keywords, invalid: invalidCustomPropertyOperator },
-			`customPropertyOperator ${messageInvalidBool} "${invalidCustomPropertyOperator}"`
+			`customPropertyOperator ${messageInvalidBool} "${invalidCustomPropertyOperator}"`,
 			)
 		}
 		/* #regionend */
@@ -115,7 +116,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
 				{ options: requireCustomNormalizer, requires: "conditionNormalizer" },
-				`A custom conditionNormalizer function must be specified when using the following options: ${requireCustomNormalizer.join(", ")}`
+				`A custom conditionNormalizer function must be specified when using the following options: ${requireCustomNormalizer.join(", ")}`,
 			)
 		}
 		const requireCustomComparer: (keyof ParserOptions)[] = [] as any
@@ -126,7 +127,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
 				{ options: requireCustomComparer, requires: "valueComparer" },
-					`A custom valueComparer function must be specified when using the following options: ${requireCustomComparer.join(", ")}`
+					`A custom valueComparer function must be specified when using the following options: ${requireCustomComparer.join(", ")}`,
 			)
 		}
 	}
@@ -135,7 +136,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 			throw new BooleanParserLibraryError(
 				ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
 				{ requires: "valueValidator" },
-				`A custom valueValidator function must be specified when using the validate method.`
+				`A custom valueValidator function must be specified when using the validate method.`,
 			)
 		}
 	}

package/src/helpers/parser/extractPosition.ts

@@ -1,15 +1,11 @@
+import type { Token } from "../../Lexer.js"
 import type { Position } from "../../types/ast.js"
 
 
-type ChevrotainLocation = {
-	startOffset?: number
-	endOffset?: number
-}
-
 /** @internal */
-export function extractPosition(loc: ChevrotainLocation, shift: number): Position {
+export function extractPosition(pos: Pick<Token, "startOffset" | "endOffset">, shift: number): Position {
 	return {
-		start: loc.startOffset! - (shift ?? 0),
-		end: loc.endOffset! + 1 - (shift ?? 0),
+		start: pos.startOffset! - (shift ?? 0),
+		end: pos.endOffset! + 1 - (shift ?? 0),
 	}
 }

package/src/helpers/parser/getUnclosedRightParenCount.ts

@@ -1,20 +1,20 @@
-import { type IToken, tokenMatcher } from "chevrotain"
-
-import type { createTokens } from "../../grammar/createTokens.js"
+import { $T, type Token } from "../../Lexer.js"
 
 
 /** @internal */
-export function getUnclosedRightParenCount(tokens: IToken[], t: ReturnType<typeof createTokens>["tokens"]): number {
+
+
+export function getUnclosedRightParenCount(tokens: Token[]): number {
 	let open = 0
 	let unclosed = 0
 	for (const token of tokens) {
-		if (tokenMatcher(token, t.PAREN_R)) {
+		if (token.type === $T.PAREN_R) {
 			if (open > 0) {
 				open--
 			} else {
 				unclosed++
 			}
-		} else if (tokenMatcher(token, t.PAREN_L)) {
+		} else if (token.type === $T.PAREN_L) {
 			open++
 		}
 	}

package/src/helpers/parser/index.ts

@@ -1,4 +1,4 @@
-/* Autogenerated Index */
+/* Autogenerated Index [Ignore] */
 
 export { assignParents } from "./assignParents.js"
 export { checkParserOpts } from "./checkParserOpts.js"

package/src/helpers/parser/parseParserOptions.ts

@@ -6,7 +6,7 @@ import { defaultValueComparer } from "../general/defaultValueComparer.js"
 
 /** @internal */
 export function parseParserOptions<T extends {} = {}>(
-	options: ParserOptions<T>
+	options: ParserOptions<T>,
 ): FullParserOptions<T> {
 	const opts: ParserOptions = {
 		prefixApplier: defaultPrefixApplier,

package/src/index.ts

@@ -1,7 +1,7 @@
 /* Manually Generated Index */
+
 export * as ast from "./ast/classes/index.js"
-export * as grammar from "./grammar/index.js"
-export { Parser } from "./parser.js"
+export { Parser } from "./Parser.js"
 export * from "./types/index.js"
 export * as utils from "./utils/index.js"
 

package/src/methods/autocomplete.ts

@@ -1,8 +1,8 @@
-import { unreachable } from "@alanscodelog/utils"
+import { unreachable } from "@alanscodelog/utils/unreachable"
 
 import { ConditionNode } from "../ast/classes/ConditionNode.js"
 import { VariableNode } from "../ast/classes/VariableNode.js"
-import type { Parser } from "../parser.js"
+import type { Parser } from "../Parser.js"
 import { type Completion, type Suggestion, SUGGESTION_TYPE } from "../types/autocomplete.js"
 import type { FullParserOptions } from "../types/parser.js"
 
@@ -30,9 +30,9 @@ export class AutocompleteMixin<T extends {}> {
 			"regexFlags" |
 			"expandedPropertyOperators" |
 			"customPropertyOperators", string[]>> & {
-			quote?: string
-			keywords?: FullParserOptions<T>["keywords"]
-		} = {}
+				quote?: string
+				keywords?: FullParserOptions<T>["keywords"]
+			} = {},
 	): Completion[] {
 		const self = (this as any as Parser<T>)
 		return suggestions.map(suggestion => {

package/src/methods/autoreplace.ts

@@ -1,4 +1,4 @@
-import { insert } from "@alanscodelog/utils"
+import { insert } from "@alanscodelog/utils/insert"
 
 import type { Completion } from "../types/autocomplete.js"
 
@@ -11,7 +11,7 @@ export class AutoreplaceMixin {
 	 */
 	autoreplace(
 		input: string,
-		{ value, suggestion }: Completion
+		{ value, suggestion }: Completion,
 	): { replacement: string, cursor: number } {
 		const isQuotedLeft = ["\"", "'", "`"].includes(value[0])
 		const isQuotedRight = ["\"", "'", "`"].includes(value[value.length - 1])

package/src/methods/autosuggest.ts

@@ -1,5 +1,5 @@
-import type { DeepPartial } from "@alanscodelog/utils"
-import { unreachable } from "@alanscodelog/utils"
+import type { DeepPartial } from "@alanscodelog/utils/types"
+import { unreachable } from "@alanscodelog/utils/unreachable"
 
 import { pos } from "../ast/builders/pos.js"
 import { ArrayNode } from "../ast/classes/ArrayNode.js"
@@ -8,7 +8,7 @@ import { ErrorToken } from "../ast/classes/ErrorToken.js"
 import { GroupNode } from "../ast/classes/GroupNode.js"
 import type { ValidToken } from "../ast/classes/ValidToken.js"
 import { VariableNode } from "../ast/classes/VariableNode.js"
-import type { Parser } from "../parser.js"
+import type { Parser } from "../Parser.js"
 import { type ParserResults, TOKEN_TYPE } from "../types/ast.js"
 import { type Suggestion, SUGGESTION_TYPE } from "../types/autocomplete.js"
 import type { KeywordEntry } from "../types/parser.js"

package/src/methods/evaluate.ts

@@ -1,8 +1,10 @@
-import { type AddParameters, get, unreachable } from "@alanscodelog/utils"
+import { get } from "@alanscodelog/utils/get"
+import { type AddParameters } from "@alanscodelog/utils/types"
+import { unreachable } from "@alanscodelog/utils/unreachable"
 
 import { Condition } from "../ast/classes/Condition.js"
 import { Expression } from "../ast/classes/Expression.js"
-import type { Parser } from "../parser.js"
+import type { Parser } from "../Parser.js"
 import { TOKEN_TYPE } from "../types/ast.js"
 
 

package/src/methods/getIndexes.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-labels */
 
-import { type AddParameters, unreachable } from "@alanscodelog/utils"
+import { type AddParameters } from "@alanscodelog/utils/types"
+import { unreachable } from "@alanscodelog/utils/unreachable"
 
 import { Condition } from "../ast/classes/Condition.js"
 import { Expression } from "../ast/classes/Expression.js"

package/src/methods/normalize.ts

@@ -1,4 +1,5 @@
-import { type AddParameters, unreachable } from "@alanscodelog/utils"
+import { type AddParameters } from "@alanscodelog/utils/types"
+import { unreachable } from "@alanscodelog/utils/unreachable"
 
 import { ArrayNode } from "../ast/classes/ArrayNode.js"
 import { Condition } from "../ast/classes/Condition.js"
@@ -11,7 +12,7 @@ import { ValidToken } from "../ast/classes/ValidToken.js"
 import { VariableNode } from "../ast/classes/VariableNode.js"
 import { applyBoolean } from "../helpers/general/applyBoolean.js"
 import { applyPrefix } from "../helpers/general/applyPrefix.js"
-import type { Parser } from "../parser.js"
+import type { Parser } from "../Parser.js"
 import { type ParserResults, TOKEN_TYPE, type TokenBooleanTypes } from "../types/ast.js"
 import type { ValueQuery } from "../types/parser.js"
 
@@ -24,8 +25,6 @@ const OPPOSITE = {
 export class NormalizeMixin<T extends {}> {
 	/**
 	 * Normalizes the ast by applying {@link GroupNode GroupNodes} and converting {@link ConditionNode ConditionNodes} to {@link NormalizedConditionNode NormalizedConditionNodes}.
-	 *
-	 * To do this, a
 	 */
 	normalize<TType extends string, TValue>(ast: ParserResults): Condition<TType, TValue> | Expression<TType, TValue> {
 		// @ts-expect-error private method

package/src/methods/validate.ts

@@ -1,4 +1,6 @@
-import { type AddParameters, get, isArray } from "@alanscodelog/utils"
+import { get } from "@alanscodelog/utils/get"
+import { isArray } from "@alanscodelog/utils/isArray"
+import { type AddParameters } from "@alanscodelog/utils/types"
 
 import { ArrayNode } from "../ast/classes/ArrayNode.js"
 import { ConditionNode } from "../ast/classes/ConditionNode.js"
@@ -9,7 +11,7 @@ import { ValidToken } from "../ast/classes/ValidToken.js"
 import { VariableNode } from "../ast/classes/VariableNode.js"
 import { applyBoolean } from "../helpers/general/applyBoolean.js"
 import { applyPrefix } from "../helpers/general/applyPrefix.js"
-import type { Parser } from "../parser.js"
+import type { Parser } from "../Parser.js"
 import { type ParserResults, type Position, TOKEN_TYPE } from "../types/ast.js"
 import type { ValidationQuery } from "../types/parser.js"
 

package/src/types/ast.ts

@@ -1,13 +1,6 @@
-import type { AnyFunction } from "@alanscodelog/utils"
-
-import type { ArrayNode } from "../ast/classes/ArrayNode.js"
-import type { ConditionNode } from "../ast/classes/ConditionNode.js"
-import type { ErrorToken } from "../ast/classes/ErrorToken.js"
-import type { ExpressionNode } from "../ast/classes/ExpressionNode.js"
-import type { GroupNode } from "../ast/classes/GroupNode.js"
-import type { ValidToken } from "../ast/classes/ValidToken.js"
-import type { VariableNode } from "../ast/classes/VariableNode.js"
+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>