@witchcraft/expressit 0.2.1 → 0.2.2

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

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

package/dist/internal/parseParserOptions.d.ts

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

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

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

package/dist/package.json.js

@@ -1,151 +1,25 @@
 const name = "@witchcraft/expressit";
 const description = "A blazing fast, customizable, error-tolerant expression parser that creates safe to eval expressions + a few other goodies like autocomplete.";
-const version = "0.2.1";
+const version = "0.2.2";
 const types = "./dist/index.d.ts";
 const type = "module";
 const module = "./dist/index.js";
 const sideEffects = false;
-const exports = {
-  ".": {
-    types: "./dist/index.d.ts",
-    "import": "./dist/index.js"
-  },
-  "./ast": {
-    types: "./dist/ast/index.d.ts",
-    "import": "./dist/ast/index.js"
-  },
-  "./ast/*": {
-    types: "./dist/ast/*",
-    "import": "./dist/ast/*"
-  },
-  "./internal": {
-    types: "./dist/internal/index.d.ts",
-    "import": "./dist/internal/index.js"
-  },
-  "./internal/*": {
-    types: "./dist/internal/*",
-    "import": "./dist/internal/*"
-  },
-  "./methods": {
-    types: "./dist/methods/index.d.ts",
-    "import": "./dist/methods/index.js"
-  },
-  "./methods/*": {
-    types: "./dist/methods/*",
-    "import": "./dist/methods/*"
-  },
-  "./utils": {
-    types: "./dist/utils/index.d.ts",
-    "import": "./dist/utils/index.js"
-  },
-  "./utils/*": {
-    types: "./dist/utils/*",
-    "import": "./dist/utils/*"
-  },
-  "./examples": {
-    types: "./dist/examples/index.d.ts",
-    "import": "./dist/examples/index.js"
-  },
-  "./examples/*": {
-    types: "./dist/examples/*",
-    "import": "./dist/examples/*"
-  },
-  "./*": {
-    types: "./dist/types/*",
-    "import": "./dist/types/*"
-  }
-};
-const scripts = {
-  debug: "ts-node -r tsconfig-paths/register -T --esm",
-  build: "vite build",
-  "build:dev": "vite build --mode development",
-  "build:watch": "vite build --watch --mode production",
-  "build:types": "tsc --emitDeclarationOnly -p tsconfig.types.json && npm run build:types:fix",
-  "build:types:fix": "tsc-alias -p tsconfig.types.json --debug",
-  "lint:eslint": 'eslint "{src,tests,bin}/**/*.{cjs,js,ts}" "*.{cjs,js,ts}" --max-warnings=1 --report-unused-disable-directives',
-  "lint:types": "tsc --noEmit --pretty",
-  "lint:commits": "commitlint --from $(git rev-list --max-parents=0 HEAD) --to HEAD --verbose",
-  "lint:imports": "madge --circular --extensions ts ./src",
-  lint: "npm run lint:types && npm run lint:eslint",
-  coverage: "vitest --exclude '.direnv/**/*' --coverage",
-  "coverage:dev": "vitest --exclude '.direnv/**/*'  --watch --coverage",
-  test: "npm run lint:types && vitest run --exclude '.direnv/**/*'",
-  "test:watch": "vitest --watch --exclude '.direnv/**/*'",
-  "test:inspect-errors": "cross-env INSPECT_ERRORS=true npm run test",
-  doc: "typedoc --options typedoc.config.cjs",
-  "doc:watch": 'onchange -i "src/**/*.ts" "typedoc.config.cjs" -- npm run doc',
-  "doc:serve": "http-server docs --port=5001",
-  "doc:dev": 'concurrently "npm run doc:watch" "npm run doc:serve"',
-  "doc:check-invalid": "typedoc --options typedoc.config.cjs --listInvalidSymbolLinks",
-  "demo:dev": 'cd demo && concurrently "vite" "npm run build:watch"',
-  "demo:build": "cd demo && npm run build",
-  "actions:debug": "act -r -v -j build",
-  "gen:exports": "indexit update -o '${path}.js' -i **/*.d.ts",
-  prepare: "husky && npm run build"
-};
-const dependencies = {
-  "@alanscodelog/utils": "^4.0.0"
-};
-const devDependencies = {
-  "@alanscodelog/commitlint-config": "^3.0.1",
-  "@alanscodelog/eslint-config": "5.0.0-beta.3",
-  "@alanscodelog/semantic-release-config": "^4.1.2",
-  "@alanscodelog/tsconfigs": "^4.0.1",
-  "@commitlint/cli": "^19.3.0",
-  "@types/node": "^20.4.1",
-  "@vitest/coverage-v8": "^1.6.0",
-  concurrently: "^8.2.0",
-  "cross-env": "^7.0.3",
-  "fast-glob": "^3.3.1",
-  "http-server": "^14.1.1",
-  husky: "^9.0.11",
-  indexit: "2.1.0-beta.3",
-  madge: "^7.0.0",
-  onchange: "^7.1.0",
-  "semantic-release": "^23.1.1",
-  "ts-node": "^10.9.1",
-  "tsc-alias": "^1.8.7",
-  typedoc: "0.26.0-beta.1",
-  typescript: "~5.4.5",
-  vite: "^5.2.11",
-  "vite-plugin-externalize-deps": "^0.8.0",
-  "vite-tsconfig-paths": "^4.2.0",
-  vitest: "^1.6.0"
-};
+const exports = { ".": { "types": "./dist/index.d.ts", "import": "./dist/index.js" }, "./ast": { "types": "./dist/ast/index.d.ts", "import": "./dist/ast/index.js" }, "./ast/*": { "types": "./dist/ast/*", "import": "./dist/ast/*" }, "./internal": { "types": "./dist/internal/index.d.ts", "import": "./dist/internal/index.js" }, "./internal/*": { "types": "./dist/internal/*", "import": "./dist/internal/*" }, "./methods": { "types": "./dist/methods/index.d.ts", "import": "./dist/methods/index.js" }, "./methods/*": { "types": "./dist/methods/*", "import": "./dist/methods/*" }, "./utils": { "types": "./dist/utils/index.d.ts", "import": "./dist/utils/index.js" }, "./utils/*": { "types": "./dist/utils/*", "import": "./dist/utils/*" }, "./examples": { "types": "./dist/examples/index.d.ts", "import": "./dist/examples/index.js" }, "./examples/*": { "types": "./dist/examples/*", "import": "./dist/examples/*" }, "./*": { "types": "./dist/types/*", "import": "./dist/types/*" } };
+const scripts = { "debug": "ts-node -r tsconfig-paths/register -T --esm", "build": "vite build", "build:dev": "vite build --mode development", "build:watch": "vite build --watch --mode production", "build:types": "tsc --emitDeclarationOnly -p tsconfig.types.json", "lint:eslint": 'eslint "{src,tests,bin}/**/*.{cjs,js,ts}" "*.{cjs,js,ts}" --max-warnings=1 --report-unused-disable-directives', "lint:types": "tsc --noEmit --pretty", "lint:commits": "commitlint --from $(git rev-list --max-parents=0 HEAD) --to HEAD --verbose", "lint:imports": "madge --circular --extensions ts ./src", "lint": "npm run lint:types && npm run lint:eslint", "coverage": "vitest --exclude '.direnv/**/*' --coverage", "coverage:dev": "vitest --exclude '.direnv/**/*'  --watch --coverage", "test:db": "rm -rf ./tests/db/migrations && pnpm drizzle-kit generate --config ./tests/db/drizzle.config.ts", "test": "pnpm test:db && npm run lint:types && vitest run --exclude '.direnv/**/*'", "test:watch": "pnpm test:db && vitest --watch --exclude '.direnv/**/*'", "test:inspect-errors": "cross-env INSPECT_ERRORS=true npm run test", "doc": "typedoc --options typedoc.config.js", "doc:watch": 'onchange -i "src/**/*.ts" "typedoc.config.cjs" -- npm run doc', "doc:serve": "http-server docs --port=5001", "doc:dev": 'concurrently "npm run doc:watch" "npm run doc:serve"', "doc:check-invalid": "typedoc --options typedoc.config.cjs --listInvalidSymbolLinks", "demo:dev": 'cd demo && concurrently "vite" "npm run build:watch"', "demo:build": "cd demo && npm run build", "actions:debug": "act -r -v -j release", "gen:exports": "indexit update -o '${path}.js' -i **/*.d.ts", "prepare": "husky && npm run build" };
+const dependencies = { "@alanscodelog/utils": "^4.0.0" };
+const devDependencies = { "@alanscodelog/commitlint-config": "^3.0.1", "@alanscodelog/eslint-config": "5.0.3", "@alanscodelog/semantic-release-config": "^5.0.3", "@alanscodelog/tsconfigs": "^5.0.1", "@commitlint/cli": "^19.6.1", "@electric-sql/pglite": "^0.2.12", "@types/node": "^22.10.2", "@vitest/coverage-v8": "^2.1.8", "concurrently": "^9.1.0", "cross-env": "^7.0.3", "drizzle-kit": "^0.30.1", "drizzle-orm": "^0.38.2", "fast-glob": "^3.3.1", "http-server": "^14.1.1", "husky": "^9.1.7", "indexit": "2.1.0-beta.3", "madge": "^8.0.0", "onchange": "^7.1.0", "semantic-release": "^24.2.0", "ts-node": "^10.9.1", "typedoc": "0.27.5", "typescript": "~5.7.2", "vite": "^6.0.2", "vite-plugin-externalize-deps": "^0.8.0", "vite-tsconfig-paths": "^5.1.4", "vitest": "^2.1.8" };
 const author = "Alan <alanscodelog@gmail.com>";
 const repository = "https://github.com/witchcraftjs/expressit";
-const keywords = [
-  "boolean",
-  "parser",
-  "query",
-  "evaluator",
-  "expression",
-  "condition",
-  "search"
-];
+const keywords = ["boolean", "parser", "query", "evaluator", "expression", "condition", "search"];
 const license = "MIT";
-const files = [
-  "src",
-  "dist"
-];
-const release = {
-  "extends": [
-    "@alanscodelog/semantic-release-config"
-  ]
-};
-const commitlint = {
-  "extends": [
-    "@alanscodelog"
-  ]
-};
+const files = ["src", "dist"];
+const release = { "extends": ["@alanscodelog/semantic-release-config"] };
+const commitlint = { "extends": ["@alanscodelog"] };
 const browserslist = "defaults and supports es6-module,maintained node versions";
-const engines = {
-  node: ">=18.0.0"
-};
-const publishConfig = {
-  access: "public"
-};
-const pkg = {
+const engines = { "node": ">=18.0.0" };
+const publishConfig = { "access": "public" };
+const packageJson = {
   name,
   description,
   version,
@@ -166,21 +40,14 @@ const pkg = {
   commitlint,
   browserslist,
   engines,
-  "@comments": {
-    scripts: {
-      test: "Runs `lint:types` before (so that flags can be passed to the test command) so that we can test type assertions. See expect_type function in @alanscodelog/utils.",
-      "lint:commits": "Lints all unpushed commits in the active branch.",
-      prepare: "Needed so that if we pull the package from git it will get built and installed properly.",
-      "actions:debug": "For debugging github build action locally with nektos/act. Requires act and docker. Note: Cache will never work locally because of https://github.com/nektos/act/issues/285"
-    }
-  },
+  "@comments": { "scripts": { "test": "Runs `lint:types` before (so that flags can be passed to the test command) so that we can test type assertions. See expect_type function in @alanscodelog/utils.", "lint:commits": "Lints all unpushed commits in the active branch.", "prepare": "Needed so that if we pull the package from git it will get built and installed properly.", "actions:debug": "For debugging github build action locally with nektos/act. Requires act and docker. Note: Cache will never work locally because of https://github.com/nektos/act/issues/285" } },
   publishConfig
 };
 export {
   author,
   browserslist,
   commitlint,
-  pkg as default,
+  packageJson as default,
   dependencies,
   description,
   devDependencies,

package/dist/types/parser.d.ts

@@ -1,9 +1,9 @@
 import type { DeepRequired, MakeRequired } from "@alanscodelog/utils/types";
 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">> & {
+export type FullParserOptions<T = any> = MakeRequired<ParserOptions<T>, Exclude<keyof ParserOptions<T>, "prefixableStrings" | "expandedPropertySeparator" | "customPropertyOperators" | "keywords">> & {
     keywords: DeepRequired<KeywordOptions>;
 };
-export type ParserOptions<T extends {} = {}> = {
+export type ParserOptions<T = any> = {
     /**
      * Allows any conditions (i.e. a variable or negated variable) to precede groups and append themselves to all variables inside them. Regular use of groups for changing precedence (e.g. `(a || b) && c` ) or negating expressions `!(a || b)` is still supported even if `prefixableGroups` is false.
      *
@@ -101,7 +101,7 @@ export type ParserOptions<T extends {} = {}> = {
     /**
      * Enables regex strings as values. The value is treated as if it was quoted by forward slashes. Any repetition of lowercase characters (even if there are multiple) attached to the end are assumed to be flags and added as a single token to the value's `quotes.mode` property.
      *
-     * Can be passed a custom function to determine when to use the regex value or not (it is converted to a regular value). The function is passed the property, the operator, and whether it's an expanded operator. If their is an error token for the property or operator, an empty string is passed.
+     * Can be passed a custom function to determine when to use the regex value or not (it is converted to a regular value). The function is passed the property, the operator, and whether it's an expanded operator. If there is an error token for the property or operator, an empty string is passed.
      *
      * ```ts
      * // allow anything (`prop=/val/`, `prop:op:/val`, `prop=(/val/)`, `prop:op(/val/)`) but the value alone (`/regex/`)
@@ -257,7 +257,7 @@ export type ParserOptions<T extends {} = {}> = {
      * ```ts
      * type Operators = "contains"
      * function valueComparer(condition: Omit<Condition, "negate">, contextValue: any, context: any): boolean {
-     * 	switch (operator as Operators) {
+     * 	switch (condition.operator as Operators) {
      * 		case "contains": return (contextValue as string[]).includes(condition.value as string)
      * 		// ...
      * 	}
@@ -292,13 +292,13 @@ export type ParserOptions<T extends {} = {}> = {
      * 	if (prefix) {
      * 		const val = value as string // it's always a string if prefixed
      * 		switch (prefix as RawPrefixes) {
-     * 			case "num": finalValue = parseInt(val, 2); break
+     * 			case "num": finalValue = parseInt(val, 10); break
      * 			// ...
      * 		}
      * 	}
      * 	// another way to allow special unquoted value types is something like this:
      * 	if (typeof value === "string" && !isQuoted) {
-     * 		const asNum = parseInt(value, 2)
+     * 		const asNum = parseInt(value, 10)
      * 		if (!isNaN(asNum)) finalValue = asNum
      * 		if (["true","false"].includes(value)) {
      * 			finalValue = value === "true" ? true : false

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/getCursorInfo.js

@@ -37,7 +37,7 @@ function getCursorInfo(input, ast, index) {
       }
     }
     if (token.start >= index) {
-      info.next || (info.next = token);
+      info.next ?? (info.next = token);
       if (token.valid && !info.valid.next) {
         info.valid.next = token;
         break;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@witchcraft/expressit",
 	"description": "A blazing fast, customizable, error-tolerant expression parser that creates safe to eval expressions + a few other goodies like autocomplete.",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"types": "./dist/index.d.ts",
 	"type": "module",
 	"module": "./dist/index.js",
@@ -61,8 +61,7 @@
 		"build": "vite build",
 		"build:dev": "vite build --mode development",
 		"build:watch": "vite build --watch --mode production",
-		"build:types": "tsc --emitDeclarationOnly -p tsconfig.types.json && npm run build:types:fix",
-		"build:types:fix": "tsc-alias -p tsconfig.types.json --debug",
+		"build:types": "tsc --emitDeclarationOnly -p tsconfig.types.json",
 		"lint:eslint": "eslint \"{src,tests,bin}/**/*.{cjs,js,ts}\" \"*.{cjs,js,ts}\" --max-warnings=1 --report-unused-disable-directives",
 		"lint:types": "tsc --noEmit --pretty",
 		"lint:commits": "commitlint --from $(git rev-list --max-parents=0 HEAD) --to HEAD --verbose",
@@ -70,17 +69,18 @@
 		"lint": "npm run lint:types && npm run lint:eslint",
 		"coverage": "vitest --exclude '.direnv/**/*' --coverage",
 		"coverage:dev": "vitest --exclude '.direnv/**/*'  --watch --coverage",
-		"test": "npm run lint:types && vitest run --exclude '.direnv/**/*'",
-		"test:watch": "vitest --watch --exclude '.direnv/**/*'",
+		"test:db": "rm -rf ./tests/db/migrations && pnpm drizzle-kit generate --config ./tests/db/drizzle.config.ts",
+		"test": "pnpm test:db && npm run lint:types && vitest run --exclude '.direnv/**/*'",
+		"test:watch": "pnpm test:db && vitest --watch --exclude '.direnv/**/*'",
 		"test:inspect-errors": "cross-env INSPECT_ERRORS=true npm run test",
-		"doc": "typedoc --options typedoc.config.cjs",
+		"doc": "typedoc --options typedoc.config.js",
 		"doc:watch": "onchange -i \"src/**/*.ts\" \"typedoc.config.cjs\" -- npm run doc",
 		"doc:serve": "http-server docs --port=5001",
 		"doc:dev": "concurrently \"npm run doc:watch\" \"npm run doc:serve\"",
 		"doc:check-invalid": "typedoc --options typedoc.config.cjs --listInvalidSymbolLinks",
 		"demo:dev": "cd demo && concurrently \"vite\" \"npm run build:watch\"",
 		"demo:build": "cd demo && npm run build",
-		"actions:debug": "act -r -v -j build",
+		"actions:debug": "act -r -v -j release",
 		"gen:exports": "indexit update -o '${path}.js' -i **/*.d.ts",
 		"prepare": "husky && npm run build"
 	},
@@ -89,29 +89,31 @@
 	},
 	"devDependencies": {
 		"@alanscodelog/commitlint-config": "^3.0.1",
-		"@alanscodelog/eslint-config": "5.0.0-beta.3",
-		"@alanscodelog/semantic-release-config": "^4.1.2",
-		"@alanscodelog/tsconfigs": "^4.0.1",
-		"@commitlint/cli": "^19.3.0",
-		"@types/node": "^20.4.1",
-		"@vitest/coverage-v8": "^1.6.0",
-		"concurrently": "^8.2.0",
+		"@alanscodelog/eslint-config": "5.0.3",
+		"@alanscodelog/semantic-release-config": "^5.0.3",
+		"@alanscodelog/tsconfigs": "^5.0.1",
+		"@commitlint/cli": "^19.6.1",
+		"@electric-sql/pglite": "^0.2.12",
+		"@types/node": "^22.10.2",
+		"@vitest/coverage-v8": "^2.1.8",
+		"concurrently": "^9.1.0",
 		"cross-env": "^7.0.3",
+		"drizzle-kit": "^0.30.1",
+		"drizzle-orm": "^0.38.2",
 		"fast-glob": "^3.3.1",
 		"http-server": "^14.1.1",
-		"husky": "^9.0.11",
+		"husky": "^9.1.7",
 		"indexit": "2.1.0-beta.3",
-		"madge": "^7.0.0",
+		"madge": "^8.0.0",
 		"onchange": "^7.1.0",
-		"semantic-release": "^23.1.1",
+		"semantic-release": "^24.2.0",
 		"ts-node": "^10.9.1",
-		"tsc-alias": "^1.8.7",
-		"typedoc": "0.26.0-beta.1",
-		"typescript": "~5.4.5",
-		"vite": "^5.2.11",
+		"typedoc": "0.27.5",
+		"typescript": "~5.7.2",
+		"vite": "^6.0.2",
 		"vite-plugin-externalize-deps": "^0.8.0",
-		"vite-tsconfig-paths": "^4.2.0",
-		"vitest": "^1.6.0"
+		"vite-tsconfig-paths": "^5.1.4",
+		"vitest": "^2.1.8"
 	},
 	"author": "Alan <alanscodelog@gmail.com>",
 	"repository": "https://github.com/witchcraftjs/expressit",

package/src/Lexer.ts

@@ -100,7 +100,7 @@ export interface TokenCategoryType<
 	TTokens extends RealTokenType<$T, any>[] = RealTokenType<$T, any>[],
 > extends BaseTokenType<TC> {
 	isCategory: true
-	entries: Partial<{[ key in TTokens[number]["type"]]: TTokens[number] }>
+	entries: Partial<Record<TTokens[number]["type"], TTokens[number]>>
 	// entries: Partial<Record<TTokens[number]["type"], TTokens[number]>>
 }
 
@@ -181,10 +181,10 @@ export class Lexer {
 
 	branches: {[key in keyof typeof MODE]?: TokenType<$T>[] }
 
-	opts: FullParserOptions<{}>
+	opts: FullParserOptions<any>
 
 	constructor(
-		opts: Partial<FullParserOptions<{}>> = {},
+		opts: Partial<FullParserOptions<any>> = {},
 	) {
 		this.opts = parseParserOptions(opts)
 		checkParserOpts(this.opts)
@@ -332,6 +332,7 @@ export class Lexer {
 						previous?.type === $T.VALUE_NOT_SINGLE
 						/* Similarly, if the previous token was an unquoted value, we have a quote error.*/
 						|| previous?.type === $T.VALUE_UNQUOTED) {
+						if (mode.startsWith(BRACKET_PREFIX)) return MODE.BRACKET_MAIN
 						return MODE.MAIN
 					}
 					switch (mode) {
@@ -369,6 +370,7 @@ export class Lexer {
 				push: (mode, tokens) => {
 					const previous = tokens[tokens.length - 2]
 					if (previous?.type === $T.VALUE_NOT_BACKTICK || previous?.type === $T.VALUE_UNQUOTED) {
+						if (mode.startsWith(BRACKET_PREFIX)) return MODE.BRACKET_MAIN
 						return MODE.MAIN
 					}
 					switch (mode) {
@@ -663,7 +665,6 @@ export class Lexer {
 				if (match) {
 					let matchLength = match === true ? 1 : (match as string).length
 					let type = t.type
-					
 					if (t.longerAlt) {
 						const longerMatch = this.$[t.longerAlt].matches(c, input, index, mode)
 						const longerMatchLength = longerMatch === true ? 1 : (longerMatch as string).length

package/src/Parser.ts

@@ -70,7 +70,7 @@ const tokenVariable = [TOKEN_TYPE.BACKTICK, TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.S
 /**
  * Creates the main parser class which handles all functionality (evaluation, validation, etc).
  */
-export class Parser<T extends {} = {}> {
+export class Parser<T = any> {
 	// needed for evaluate and validate so they are only checked on demand
 	private evaluationOptionsChecked: boolean = false
 
@@ -1803,6 +1803,7 @@ export class Parser<T extends {} = {}> {
 				if (prefix !== undefined && !isNested) {
 					name = name ? applyPrefix(prefix, name, opts.prefixApplier) : prefix
 				}
+
 				let value: any
 				if (isNested) {
 					value = name ?? true
@@ -1855,16 +1856,21 @@ export class Parser<T extends {} = {}> {
 				return self_.normalize(ast.value, name, boolValue, operator) as any
 			}
 		}
-
 		if (ast.type === AST_TYPE.GROUP) {
 			const _prefix = ast.prefix?.type === AST_TYPE.CONDITION && ast.prefix?.value.type === AST_TYPE.VARIABLE
 				? unescape(ast.prefix.value.value.value!)
 				: undefined // we do not want to apply not tokens
+			const isNotToken = _prefix === undefined
+
 			const _groupValue = ast.prefix?.type === AST_TYPE.CONDITION
 				? ast.prefix.operator === undefined
 				: !(ast.prefix?.valid === true)
 
-			const applied = applyPrefix(prefix, _prefix ?? "", opts.prefixApplier)
+			// do not attempt to apply prefix if it's undefined (a not token)
+			// otherwise we would get weird calls to applyPrefix
+			const applied = isNotToken
+				? prefix
+				: applyPrefix(prefix, _prefix, opts.prefixApplier)
 
 			return self_.normalize(ast.expression as any, applied, applyBoolean(groupValue, _groupValue), operator) as any
 		}

package/src/ast/builders/delim.ts

@@ -21,7 +21,7 @@ export function delim<
 	{
 		left: TLeft extends string ? true : TLeft
 		right: TRight extends string ? true : TRight
-	} & TType extends undefined ? {} : { type: TType } {
+	} & TType extends undefined ? Record<string,never> : { type: TType } {
 	let quoteType
 	if (typeof left === "string") quoteType = type(left)
 	else if (typeof right === "string") quoteType = type(right)

package/src/ast/handlers.ts

@@ -115,15 +115,15 @@ export function condition(
 		node.sep = {}
 		if (sepL) {
 			node.sep.left = sepL
-			node.property ||= error(sepL.start, [TOKEN_TYPE.VALUE])
-			node.propertyOperator ||= error(sepL?.end ?? 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(node.value?.start ?? end, [TOKEN_TYPE.OP_EXPANDED_SEP])
 		}
 	} else if (propertyOperator) {
-		node.property ||= error(propertyOperator.start, [TOKEN_TYPE.VALUE])
+		node.property ??= error(propertyOperator.start, [TOKEN_TYPE.VALUE])
 	}
 	return createConditionNode(node as ConditionNode)
 }