@witchcraft/expressit 0.1.2 → 0.2.0

package/src/ast/handlers.ts

@@ -1,39 +1,38 @@
 /* eslint-disable @typescript-eslint/no-shadow */
 
-import { ArrayNode } from "./classes/ArrayNode.js"
-import { ConditionNode } from "./classes/ConditionNode.js"
-import { ErrorToken } from "./classes/ErrorToken.js"
-import { ExpressionNode } from "./classes/ExpressionNode.js"
-import { GroupNode } from "./classes/GroupNode.js"
-import { ValidToken } from "./classes/ValidToken.js"
-import { VariableNode } from "./classes/VariableNode.js"
+import { createArrayNode } from "./createArrayNode.js"
+import { createConditionNode } from "./createConditionNode.js"
+import { createExpressionNode } from "./createExpressionNode.js"
+import { createGroupNode } from "./createGroupNode.js"
+import { createToken } from "./createToken.js"
+import { createVariableNode } from "./createVariableNode.js"
 
-import { type AnyToken, type FirstConstructorParam, type Position, TOKEN_TYPE, type TokenBooleanTypes, type TokenDelimiterTypes, type TokenOperatorTypes, type TokenQuoteTypes } from "../types/ast.js"
+import { type AnyToken, type ArrayNode,AST_TYPE,type ConditionNode, type ErrorToken, type ExpressionNode,type FirstParam,type GroupNode, type Position, TOKEN_TYPE, type TokenBooleanTypes, type TokenDelimiterTypes, type TokenOperatorTypes, type TokenQuoteTypes, type ValidToken, type VariableNode } from "../types/ast.js"
 
 
 /* #region HELPERS */
-function error<T extends TOKEN_TYPE>(pos: number, expected: T[]): ErrorToken<T> {
+function error<T extends TOKEN_TYPE>(pos: number, expected: T[]): ErrorToken {
 	if (pos === undefined) throw new Error("should never happen, passed undefined position for error token")
-	return new ErrorToken({ expected, start: pos, end: pos })
+	return createToken({ expected, start: pos, end: pos })
 }
 /* #regionend */
 
 /* #region TOKENS */
 const operators = <T extends TokenOperatorTypes>
 (type: T) =>
-	(value: string, pos: Position): ValidToken<T> => new ValidToken({ value, type, ...pos })
+	(value: string, pos: Position): ValidToken<T> => createToken({ value, type, ...pos })
 
 const delimiters = <T extends TokenDelimiterTypes>
 (type: T) =>
 	(value: string | undefined, pos: Position): ValidToken<T> | undefined =>
 		// check must be falsy, we want to return undefined when given ""
-		value ? new ValidToken({ value, type, ...pos }) : undefined
+		value ? createToken({ value, type, ...pos }) : undefined
 
-const maybeToken = <T extends TOKEN_TYPE> (type: T) => <TVal extends string | undefined> (value: TVal, pos: Position): TVal extends string ? ValidToken<T> : ErrorToken<T> => {
+const maybeToken = <T extends TOKEN_TYPE> (type: T) => <TVal extends string | undefined> (value: TVal, pos: Position): TVal extends string ? ValidToken<T> : ErrorToken => {
 	if (value === undefined) {
 		return error(pos.end, [type]) as any
 	} else {
-		return new ValidToken({ value, type, ...pos }) as any
+		return createToken({ value, type, ...pos }) as any
 	}
 }
 
@@ -70,7 +69,7 @@ export function variable(
 	quoteR: AnyToken<TokenQuoteTypes> | null | undefined,
 	flags?: ValidToken<TOKEN_TYPE.VALUE>,
 ): VariableNode {
-	const node: FirstConstructorParam<typeof VariableNode> = {
+	const node: FirstParam<typeof createVariableNode> = {
 		prefix: prefix ?? undefined,
 		value: value ?? error((prefix?.end ?? quoteL?.end ?? quoteR?.start)!, [TOKEN_TYPE.VALUE]),
 		start: (prefix?.start ?? quoteL?.start ?? value?.start ?? quoteR?.start)!,
@@ -79,17 +78,16 @@ export function variable(
 
 	if (quoteL || quoteR) {
 		node.quote = {
-			left: quoteL ?? error(node.value.start, [(quoteR!.type)]),
-			right: quoteR ?? error(node.value.end, [(quoteL!.type)]),
+			left: quoteL ?? error(node.value.start, [(quoteR!.type!)]),
+			right: quoteR ?? error(node.value.end, [(quoteL!.type!)]),
 		}
 		if (flags) {
 			node.quote.flags = flags
-			node.end = node.quote?.flags.end
+			node.end = node.quote?.flags?.end ?? node.end
 		}
 	}
 
-	const instance = new VariableNode(node as any)
-	return instance
+	return createVariableNode(node)
 }
 
 
@@ -105,7 +103,7 @@ export function condition(
 ): ConditionNode {
 	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: FirstConstructorParam<typeof ConditionNode> = {
+	const node: FirstParam<typeof createConditionNode> = {
 		value: value ? value : error(end, [TOKEN_TYPE.VALUE]),
 		start,
 		end,
@@ -121,15 +119,13 @@ export function condition(
 			node.propertyOperator ||= error(sepL?.end ?? sepR?.start, [TOKEN_TYPE.VALUE])
 		}
 		if (sepR) node.sep.right = sepR
-		else if (!node.value || node.value instanceof VariableNode) {
+		else if (!node.value || node.value.type === AST_TYPE.VARIABLE) {
 			node.sep.right = error(node.value?.start ?? end, [TOKEN_TYPE.OP_EXPANDED_SEP])
 		}
 	} else if (propertyOperator) {
 		node.property ||= error(propertyOperator.start, [TOKEN_TYPE.VALUE])
 	}
-
-	const instance = new ConditionNode(node as any)
-	return instance
+	return createConditionNode(node as ConditionNode)
 }
 
 export function expression(
@@ -137,14 +133,13 @@ export function expression(
 	operator: ValidToken<TokenBooleanTypes> | null | undefined,
 	right: ConditionNode | GroupNode | null | undefined,
 ): ExpressionNode {
-	const instance = new ExpressionNode({
+	return createExpressionNode({
 		left: left ?? error((operator?.start ?? right?.start)!, [TOKEN_TYPE.VALUE]),
 		operator: operator ?? error((left?.end ?? right?.start)!, [TOKEN_TYPE.AND, TOKEN_TYPE.OR]),
 		right: right ?? error((operator?.end ?? left?.end)!, [TOKEN_TYPE.VALUE]),
 		start: (left?.start ?? operator?.start ?? right?.start)!,
 		end: (right?.end ?? operator?.end ?? left?.end)!,
 	})
-	return instance
 }
 
 export function group(
@@ -154,7 +149,7 @@ export function group(
 	condition: GroupNode["expression"],
 	parenR: ValidToken<TOKEN_TYPE.PARENR> | null | undefined,
 ): GroupNode {
-	const node: FirstConstructorParam<typeof GroupNode> = {
+	return createGroupNode({
 		prefix: prefix ?? operator ?? undefined,
 		expression: condition ?? error((parenL?.end ?? parenR?.start)!, [TOKEN_TYPE.VALUE]),
 		paren: {
@@ -163,10 +158,7 @@ export function group(
 		},
 		start: (prefix?.start ?? operator?.start ?? parenL?.start ?? condition?.start ?? parenR?.start)!,
 		end: (parenR?.end ?? condition?.end ?? parenL?.end ?? operator?.end ?? prefix?.end)!,
-	}
-
-	const instance = new GroupNode(node as any)
-	return instance
+	})
 }
 
 export function array(
@@ -174,7 +166,7 @@ export function array(
 	values: VariableNode[],
 	bracketR: ValidToken<TOKEN_TYPE.BRACKETR> | null | undefined,
 ): ArrayNode {
-	const node: FirstConstructorParam<typeof ArrayNode> = {
+	return createArrayNode({
 		values,
 		bracket: {
 			left: bracketL, // always valid for now
@@ -182,9 +174,6 @@ export function array(
 		},
 		start: bracketL.start,
 		end: (bracketR?.end ?? values[values.length - 1]?.end ?? bracketL.end)!,
-	}
-
-	const instance = new ArrayNode(node as any)
-	return instance
+	})
 }
 /* #regionend */

package/src/ast/index.ts

@@ -1,5 +1,13 @@
 export * as builders from "./builders/index.js"
-export * as classes from "./classes/index.js"
 /* Autogenerated Index */
 
+export { createArrayNode } from "./createArrayNode.js"
+export { createCondition } from "./createNormalizedCondition.js"
+export { createConditionNode } from "./createConditionNode.js"
+export { createExpression } from "./createNormalizedExpression.js"
+export { createExpressionNode } from "./createExpressionNode.js"
+export { createGroupNode } from "./createGroupNode.js"
+export { createToken } from "./createToken.js"
+export { createVariableNode } from "./createVariableNode.js"
+export { error } from "./error.js"
 export { token } from "./handlers.js"

package/src/{helpers/general → defaults}/defaultConditionNormalizer.ts

@@ -1,4 +1,4 @@
-import type { ConditionNormalizer, ValueQuery } from "../../types/parser.js"
+import type { ConditionNormalizer, ValueQuery } from "../types/parser.js"
 
 
 export const defaultConditionNormalizer: ConditionNormalizer =

package/src/{helpers/general → defaults}/defaultKeyParser.ts

@@ -1,4 +1,4 @@
-import type { KeyParser } from "../../types/parser.js"
+import type { KeyParser } from "../types/parser.js"
 
 
 export const defaultKeyParser: KeyParser =

package/src/{helpers/general → defaults}/defaultPrefixApplier.ts

@@ -1,4 +1,4 @@
-import type { PrefixApplier } from "../../types/parser.js"
+import type { PrefixApplier } from "../types/parser.js"
 
 
 export const defaultPrefixApplier: PrefixApplier =

package/src/{helpers/general → defaults}/defaultValueComparer.ts

@@ -1,4 +1,4 @@
-import type { ValueComparer } from "../../types/parser.js"
+import type { ValueComparer } from "../types/parser.js"
 
 
 export const defaultValueComparer: ValueComparer =

package/src/{helpers/general → defaults}/index.ts

@@ -1,7 +1,5 @@
 /* Autogenerated Index [Ignore] */
 
-export { applyBoolean } from "./applyBoolean.js"
-export { applyPrefix } from "./applyPrefix.js"
 export { defaultConditionNormalizer } from "./defaultConditionNormalizer.js"
 export { defaultKeyParser } from "./defaultKeyParser.js"
 export { defaultPrefixApplier } from "./defaultPrefixApplier.js"

package/src/index.ts

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

package/src/{helpers/errors.ts → internal/ExpressitError.ts}

@@ -7,8 +7,8 @@ import type { Keys } from "@alanscodelog/utils/types"
 import { repository, version } from "../package.js"
 import type { ERROR_CODES, ErrorInfo } from "../types/errors.js"
 
-
-export class BooleanParserLibraryError<T extends ERROR_CODES> extends Error {
+/** @internal */
+export class ExpressitError<T extends ERROR_CODES> extends Error {
 	version: string = version
 
 	repo: string = repository

package/src/{helpers/general → internal}/applyPrefix.ts

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

package/src/{helpers/parser → internal}/checkParserOpts.ts

@@ -1,13 +1,14 @@
 import { isBlank } from "@alanscodelog/utils/isBlank.js"
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn.js"
 
-import { ERROR_CODES } from "../../types/errors.js"
-import type { FullParserOptions, ParserOptions } from "../../types/parser.js"
-import { BooleanParserLibraryError } from "../errors.js"
-import { defaultConditionNormalizer } from "../general/defaultConditionNormalizer.js"
-import { defaultValueComparer } from "../general/defaultValueComparer.js"
+import { ExpressitError } from "./ExpressitError.js"
 
+import { defaultConditionNormalizer } from "../defaults/defaultConditionNormalizer.js"
+import { defaultValueComparer } from "../defaults/defaultValueComparer.js"
+import { ERROR_CODES } from "../types/errors.js"
+import type { FullParserOptions, ParserOptions } from "../types/parser.js"
 
+/** @internal */
 export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evaluatorChecks: boolean = false, validatorChecks: boolean = false): void {
 	if (!evaluatorChecks) {
 		const keywordsList = [...opts.keywords.and, ...opts.keywords.or, ...opts.keywords.not].map(keyword => keyword.value)
@@ -25,7 +26,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 
 		/* #region Blank Operator Checks */
 		if (opts.expandedPropertySeparator && isBlank(opts.expandedPropertySeparator)) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: [""], invalid: opts.expandedPropertySeparator },
 			`expandedPropertySeparator cannot be blank`,
@@ -33,7 +34,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		}
 		const customInvalid = opts.customPropertyOperators?.find(_ => isBlank(_))
 		if (customInvalid !== undefined) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: [""], invalid: customInvalid },
 			`customPropertyOperators cannot contain blank entries`,
@@ -41,7 +42,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		}
 		const prefixInvalid = opts.prefixableStrings?.find(_ => isBlank(_))
 		if (prefixInvalid !== undefined) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: [""], invalid: prefixInvalid },
 			`prefixableStrings cannot contain blank entries`,
@@ -52,7 +53,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 				?.find(_ => isBlank(_.value))
 				?.value
 			if (invalid !== undefined) {
-				throw new BooleanParserLibraryError(
+				throw new ExpressitError(
 					ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 					{ prohibited: [""], invalid },
 				`keywords.${key} cannot contain entries with blank values`,
@@ -75,7 +76,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 
 		const invalidPrefixableString = opts.prefixableStrings?.find(val => all.includes(val))
 		if (invalidPrefixableString) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: all, invalid: invalidPrefixableString },
 			`prefixableStrings ${messageInvalidAny} "${invalidPrefixableString}"`,
@@ -85,7 +86,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		const invalidExpandedPropertySeparator = allKeywords
 			.find(_ => _ === opts.expandedPropertySeparator as any)
 		if (invalidExpandedPropertySeparator) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: allKeywords, invalid: invalidExpandedPropertySeparator },
 			`expandedPropertySeparator ${messageInvalidBool} "${invalidExpandedPropertySeparator}"`,
@@ -96,7 +97,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		? opts.expandedPropertySeparator
 		: undefined
 		if (invalidCustomPropertyOperator) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
 				{ prohibited: keywords, invalid: invalidCustomPropertyOperator },
 			`customPropertyOperator ${messageInvalidBool} "${invalidCustomPropertyOperator}"`,
@@ -113,7 +114,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		if (opts.regexValues) requireCustomNormalizer.push("regexValues")
 
 		if (requireCustomNormalizer.length > 0 && opts.conditionNormalizer === defaultConditionNormalizer) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
 				{ options: requireCustomNormalizer, requires: "conditionNormalizer" },
 				`A custom conditionNormalizer function must be specified when using the following options: ${requireCustomNormalizer.join(", ")}`,
@@ -124,7 +125,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 		if (opts.regexValues) requireCustomComparer.push("arrayValues")
 
 		if (requireCustomComparer.length > 0 && opts.valueComparer === defaultValueComparer) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
 				{ options: requireCustomComparer, requires: "valueComparer" },
 					`A custom valueComparer function must be specified when using the following options: ${requireCustomComparer.join(", ")}`,
@@ -133,7 +134,7 @@ export function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evalua
 	}
 	if (validatorChecks) {
 		if (opts.valueValidator === undefined) {
-			throw new BooleanParserLibraryError(
+			throw new ExpressitError(
 				ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
 				{ requires: "valueValidator" },
 				`A custom valueValidator function must be specified when using the validate method.`,

package/src/internal/escapeVariableOrPrefix.ts

@@ -0,0 +1,36 @@
+import { multisplice } from "@alanscodelog/utils/multisplice.js"
+
+export function escapeVariableOrPrefix(variable: string, preferredQuote: string): string {
+	let doQuote = false
+	for (const quoteType of ["\"", "'", "`"]) {
+		if (!variable.includes(quoteType) && !variable.includes(" ")) continue
+		if (variable.startsWith(quoteType)
+								&& variable.endsWith(quoteType)) {
+			break
+		}
+		const indexes: number[] = []
+		for (let i = 0; i < variable.length; i++) {
+			const char = variable[i]
+			if (char === undefined) break
+			if (char === "\\") {
+				i += 2
+				continue
+			}
+			if (char === " ") {
+				doQuote = true
+			}
+			if (char === quoteType) indexes.push(i)
+		}
+
+		if (indexes.length === 0) break
+
+		const newVal = multisplice(variable.split(""), indexes, 0, "\\").array.join("")
+		variable = newVal
+							
+		break
+	}
+	if (doQuote) {
+		variable = `${preferredQuote}${variable}${preferredQuote}`
+	}
+	return variable
+}

package/src/{helpers/parser → internal}/extractPosition.ts

@@ -1,5 +1,5 @@
-import type { Token } from "../../Lexer.js"
-import type { Position } from "../../types/ast.js"
+import type { Token } from "../Lexer.js"
+import type { Position } from "../types/ast.js"
 
 
 /** @internal */

package/src/{helpers/parser → internal}/getUnclosedRightParenCount.ts

@@ -1,9 +1,8 @@
-import { $T, type Token } from "../../Lexer.js"
+import { $T, type Token } from "../Lexer.js"
 
 
 /** @internal */
 
-
 export function getUnclosedRightParenCount(tokens: Token[]): number {
 	let open = 0
 	let unclosed = 0

package/src/{helpers/parser → internal}/parseParserOptions.ts

@@ -1,8 +1,8 @@
-import type { FullParserOptions, ParserOptions } from "../../types/parser.js"
-import { defaultConditionNormalizer } from "../general/defaultConditionNormalizer.js"
-import { defaultKeyParser } from "../general/defaultKeyParser.js"
-import { defaultPrefixApplier } from "../general/defaultPrefixApplier.js"
-import { defaultValueComparer } from "../general/defaultValueComparer.js"
+import { defaultConditionNormalizer } from "../defaults/defaultConditionNormalizer.js"
+import { defaultKeyParser } from "../defaults/defaultKeyParser.js"
+import { defaultPrefixApplier } from "../defaults/defaultPrefixApplier.js"
+import { defaultValueComparer } from "../defaults/defaultValueComparer.js"
+import type { FullParserOptions, ParserOptions } from "../types/parser.js"
 
 /** @internal */
 export function parseParserOptions<T extends {} = {}>(