@witchcraft/expressit 0.2.2 → 0.3.1

package/dist/utils/generateParentsMap.js

@@ -2,15 +2,14 @@ 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);
+    if (ast.quote?.left) map.set(ast.quote.left, ast);
+    if (ast.quote?.right) map.set(ast.quote.right, ast);
+    if (ast.quote?.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);
@@ -19,8 +18,8 @@ function generateParentsMap(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);
+    if (ast.sep?.left) map.set(ast.sep.left, ast);
+    if (ast.sep?.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) {
@@ -34,8 +33,8 @@ function generateParentsMap(ast) {
       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);
+    if (ast.paren?.left) map.set(ast.paren.left, ast);
+    if (ast.paren?.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) {

package/dist/utils/getCursorInfo.js

@@ -1,6 +1,8 @@
-import { isArray } from "@alanscodelog/utils/isArray.js";
-import { unreachable } from "@alanscodelog/utils/unreachable.js";
+import { isArray } from "@alanscodelog/utils/isArray";
+import { unreachable } from "@alanscodelog/utils/unreachable";
 import { extractTokens } from "./extractTokens.js";
+import "../types/ast.js";
+import "../types/autocomplete.js";
 function getCursorInfo(input, ast, index) {
   const tokens = isArray(ast) ? ast : extractTokens(ast);
   if (input.length < index || index < 0) {
@@ -37,7 +39,7 @@ function getCursorInfo(input, ast, index) {
       }
     }
     if (token.start >= index) {
-      info.next ?? (info.next = token);
+      info.next ??= token;
       if (token.valid && !info.valid.next) {
         info.valid.next = token;
         break;

package/dist/utils/getOppositeDelimiter.d.ts

@@ -1,7 +1,7 @@
 import type { generateParentsMap } from "./generateParentsMap.js";
-import { type AnyToken, type TokenDelimiterTypes } from "../types/ast.js";
+import { type AnyToken, type TokenDelimiter } from "../types/ast.js";
 /**
  * Given a delimiter token, returns it's opposite pair, or undefined if the type passed was not a delimiter token (so you can pass any type without checking).
  */
-export declare function getOppositeDelimiter(token: AnyToken, parentsMap: ReturnType<typeof generateParentsMap>): AnyToken<TokenDelimiterTypes> | undefined;
+export declare function getOppositeDelimiter(token: AnyToken, parentsMap: ReturnType<typeof generateParentsMap>): AnyToken<TokenDelimiter> | undefined;
 //# sourceMappingURL=getOppositeDelimiter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOppositeDelimiter.d.ts","sourceRoot":"","sources":["../../src/utils/getOppositeDelimiter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAMjE,OAAO,EAAE,KAAK,QAAQ,EAAiE,KAAK,mBAAmB,EAAqB,MAAM,iBAAiB,CAAA;AAE3J;;GAEG;AACH,wBAAgB,oBAAoB,CACnC,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAC/C,QAAQ,CAAC,mBAAmB,CAAC,GAAG,SAAS,CAuB3C"}
+{"version":3,"file":"getOppositeDelimiter.d.ts","sourceRoot":"","sources":["../../src/utils/getOppositeDelimiter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAMjE,OAAO,EAAE,KAAK,QAAQ,EAAiE,KAAK,cAAc,EAAqB,MAAM,iBAAiB,CAAA;AAEtJ;;GAEG;AACH,wBAAgB,oBAAoB,CACnC,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAC/C,QAAQ,CAAC,cAAc,CAAC,GAAG,SAAS,CAuBtC"}

package/dist/utils/getOppositeDelimiter.js

@@ -1,4 +1,4 @@
-import { unreachable } from "@alanscodelog/utils/unreachable.js";
+import { unreachable } from "@alanscodelog/utils/unreachable";
 import { isBracket } from "./isBracket.js";
 import { isDelimiter } from "./isDelimiter.js";
 import { isParen } from "./isParen.js";

package/dist/utils/getSurroundingErrors.js

@@ -1,6 +1,5 @@
 import { TOKEN_TYPE } from "../types/ast.js";
 function getSurroundingErrors(tokens, token) {
-  var _a, _b;
   if (token.at) {
     return [];
   }
@@ -8,11 +7,11 @@ function getSurroundingErrors(tokens, token) {
   let iNext = tokens[i] === token.next ? i : i + 1;
   let iPrev = tokens[i] === token.next ? i - 1 : i;
   const errors = [];
-  while (((_a = tokens[iNext]) == null ? void 0 : _a.valid) === false) {
+  while (tokens[iNext]?.valid === false) {
     errors.push(tokens[iNext]);
     iNext++;
   }
-  while (((_b = tokens[iPrev]) == null ? void 0 : _b.valid) === false) {
+  while (tokens[iPrev]?.valid === false) {
     errors.push(tokens[iPrev]);
     iPrev--;
   }

package/dist/utils/isBracket.js

@@ -1,6 +1,6 @@
 import { TOKEN_TYPE } from "../types/ast.js";
 function isBracket(token) {
-  return [TOKEN_TYPE.BRACKETL, TOKEN_TYPE.BRACKETR].includes(token == null ? void 0 : token.type);
+  return [TOKEN_TYPE.BRACKETL, TOKEN_TYPE.BRACKETR].includes(token?.type);
 }
 export {
   isBracket

package/dist/utils/isDelimiter.d.ts

@@ -1,6 +1,6 @@
-import { type AnyToken, type TokenDelimiterTypes } from "../types/ast.js";
+import { type AnyToken, type TokenDelimiter } from "../types/ast.js";
 /**
  * Returns whether token is a delimiter type (including if it's an expanded operator separator).
  */
-export declare function isDelimiter(token?: AnyToken): token is AnyToken<TokenDelimiterTypes>;
+export declare function isDelimiter(token?: AnyToken): token is AnyToken<TokenDelimiter>;
 //# sourceMappingURL=isDelimiter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"isDelimiter.d.ts","sourceRoot":"","sources":["../../src/utils/isDelimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErF;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,mBAAmB,CAAC,CAYpF"}
+{"version":3,"file":"isDelimiter.d.ts","sourceRoot":"","sources":["../../src/utils/isDelimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhF;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,cAAc,CAAC,CAY/E"}

package/dist/utils/isDelimiter.js

@@ -10,7 +10,7 @@ function isDelimiter(token) {
     TOKEN_TYPE.BRACKETR,
     TOKEN_TYPE.OP_EXPANDED_SEP,
     TOKEN_TYPE.REGEX
-  ].includes(token == null ? void 0 : token.type);
+  ].includes(token?.type);
 }
 export {
   isDelimiter

package/dist/utils/isNode.js

@@ -1,5 +1,5 @@
 function isNode(node) {
-  return (node == null ? void 0 : node.isNode) === true;
+  return node?.isNode === true;
 }
 export {
   isNode

package/dist/utils/isParen.d.ts

@@ -1,3 +1,3 @@
-import { type AnyToken, type TokenParenTypes } from "../types/ast.js";
-export declare function isParen(token?: AnyToken): token is AnyToken<TokenParenTypes>;
+import { type AnyToken, type TokenParen } from "../types/ast.js";
+export declare function isParen(token?: AnyToken): token is AnyToken<TokenParen>;
 //# sourceMappingURL=isParen.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"isParen.d.ts","sourceRoot":"","sources":["../../src/utils/isParen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjF,wBAAgB,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,eAAe,CAAC,CAE5E"}
+{"version":3,"file":"isParen.d.ts","sourceRoot":"","sources":["../../src/utils/isParen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5E,wBAAgB,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC,CAEvE"}

package/dist/utils/isParen.js

@@ -1,6 +1,6 @@
 import { TOKEN_TYPE } from "../types/ast.js";
 function isParen(token) {
-  return [TOKEN_TYPE.PARENL, TOKEN_TYPE.PARENR].includes(token == null ? void 0 : token.type);
+  return [TOKEN_TYPE.PARENL, TOKEN_TYPE.PARENR].includes(token?.type);
 }
 export {
   isParen

package/dist/utils/isQuote.d.ts

@@ -1,4 +1,4 @@
-import { type AnyToken, type TokenQuoteTypes } from "../types/ast.js";
+import { type AnyToken, type TokenQuote } from "../types/ast.js";
 /** Returns if the token is a quote token. This includes regex delimiters. */
-export declare function isQuote(token?: AnyToken): token is AnyToken<TokenQuoteTypes>;
+export declare function isQuote(token?: AnyToken): token is AnyToken<TokenQuote>;
 //# sourceMappingURL=isQuote.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"isQuote.d.ts","sourceRoot":"","sources":["../../src/utils/isQuote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjF,6EAA6E;AAC7E,wBAAgB,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,eAAe,CAAC,CAE5E"}
+{"version":3,"file":"isQuote.d.ts","sourceRoot":"","sources":["../../src/utils/isQuote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5E,6EAA6E;AAC7E,wBAAgB,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC,CAEvE"}

package/dist/utils/isQuote.js

@@ -1,6 +1,6 @@
 import { TOKEN_TYPE } from "../types/ast.js";
 function isQuote(token) {
-  return [TOKEN_TYPE.BACKTICK, TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.SINGLEQUOTE, TOKEN_TYPE.REGEX].includes(token == null ? void 0 : token.type);
+  return [TOKEN_TYPE.BACKTICK, TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.SINGLEQUOTE, TOKEN_TYPE.REGEX].includes(token?.type);
 }
 export {
   isQuote

package/dist/utils/isToken.js

@@ -1,5 +1,5 @@
 function isToken(token) {
-  return (token == null ? void 0 : token.isToken) === true;
+  return token?.isToken === true;
 }
 export {
   isToken

package/dist/utils/prettyAst.js

@@ -1,7 +1,7 @@
-import * as color from "@alanscodelog/utils/colors.js";
-import { isBlank } from "@alanscodelog/utils/isBlank.js";
+import * as color from "@alanscodelog/utils/colors";
+import { isBlank } from "@alanscodelog/utils/isBlank";
 import "@alanscodelog/utils/types";
-import { unreachable } from "@alanscodelog/utils/unreachable.js";
+import { unreachable } from "@alanscodelog/utils/unreachable";
 import { isToken } from "./isToken.js";
 import { AST_TYPE, TOKEN_TYPE } from "../types/ast.js";
 const defaultColors = {
@@ -21,7 +21,6 @@ const toRows = (rows, opts) => {
   ];
 };
 function prettyAst(ast, { indent = "   ", children = "├╴", last = "└╴", branch = "│", quote = "" } = {}, colors = {}) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
   const opts = { indent, children, last, branch, quote };
   const c = colors ? { ...defaultColors, ...colors } : disableColors;
   const pos = `${c.position}(${ast.start}, ${ast.end})${c.reset}`;
@@ -46,10 +45,10 @@ function prettyAst(ast, { indent = "   ", children = "├╴", last = "└╴",
     const header = `${c.info}${ast.operator === void 0}${c.reset}`;
     const not = ast.operator ? prettyAst_(ast.operator, opts, c, ___, `(negation)`) : "";
     const property = ast.property ? prettyAst_(ast.property, opts, c, ___, `(property)`) : "";
-    const sepL = ((_a = ast.sep) == null ? void 0 : _a.left) ? prettyAst_(ast.sep.left, opts, c, ___, `(separator)`) : "";
+    const sepL = ast.sep?.left ? prettyAst_(ast.sep.left, opts, c, ___, `(separator)`) : "";
     const op = ast.propertyOperator ? prettyAst_(ast.propertyOperator, opts, c, ___, `(property operator)`) : "";
-    const sepR = ((_b = ast.sep) == null ? void 0 : _b.right) ? prettyAst_(ast.sep.right, opts, c, ___, `(separator)`) : "";
-    const isRegex = ast.value.type === AST_TYPE.VARIABLE && ((_c = ast.value.quote) == null ? void 0 : _c.left.type) === TOKEN_TYPE.REGEX;
+    const sepR = ast.sep?.right ? prettyAst_(ast.sep.right, opts, c, ___, `(separator)`) : "";
+    const isRegex = ast.value.type === AST_TYPE.VARIABLE && ast.value.quote?.left.type === TOKEN_TYPE.REGEX;
     const isArray = ast.value.type === AST_TYPE.ARRAY;
     const variable = prettyAst_(ast.value, opts, c, __L, `(${property ? "value" : "variable/alone"}${isRegex ? " - regex" : isArray ? "- array" : ""})`);
     return [
@@ -60,10 +59,10 @@ ${__}`);
   }
   if (ast.type === AST_TYPE.VARIABLE) {
     const prefix = ast.prefix ? prettyAst_(ast.prefix, opts, c, ___, `(value prefix)`) : "";
-    const left = ((_d = ast.quote) == null ? void 0 : _d.left) ? prettyAst_(ast.quote.left, opts, c, ___, "") : "";
-    const value = prettyAst_(ast.value, opts, c, !ast.quote ? __L : !((_e = ast.quote) == null ? void 0 : _e.right) ? __L : ___, "");
-    const right = ((_f = ast.quote) == null ? void 0 : _f.right) ? prettyAst_(ast.quote.right, opts, c, !((_g = ast.quote) == null ? void 0 : _g.flags) ? __L : ___, "") : "";
-    const flags = ((_h = ast.quote) == null ? void 0 : _h.flags) ? prettyAst_(ast.quote.flags, opts, c, __L, "(flags)") : "";
+    const left = ast.quote?.left ? prettyAst_(ast.quote.left, opts, c, ___, "") : "";
+    const value = prettyAst_(ast.value, opts, c, !ast.quote ? __L : !ast.quote?.right ? __L : ___, "");
+    const right = ast.quote?.right ? prettyAst_(ast.quote.right, opts, c, !ast.quote?.flags ? __L : ___, "") : "";
+    const flags = ast.quote?.flags ? prettyAst_(ast.quote.flags, opts, c, __L, "(flags)") : "";
     return [
       `VARIABLE ${pos}${extra}`,
       ...toRows([prefix, left, value, right, flags], opts)

package/package.json

@@ -1,10 +1,10 @@
 {
 	"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.2",
+	"version": "0.3.1",
 	"types": "./dist/index.d.ts",
 	"type": "module",
-	"module": "./dist/index.js",
+	"main": "./dist/index.js",
 	"sideEffects": false,
 	"exports": {
 		".": {
@@ -64,7 +64,7 @@
 		"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:commits": "commitlint --from-last-tag --to HEAD --verbose",
 		"lint:imports": "madge --circular --extensions ts ./src",
 		"lint": "npm run lint:types && npm run lint:eslint",
 		"coverage": "vitest --exclude '.direnv/**/*' --coverage",
@@ -85,35 +85,35 @@
 		"prepare": "husky && npm run build"
 	},
 	"dependencies": {
-		"@alanscodelog/utils": "^4.0.0"
+		"@alanscodelog/utils": "^6.0.1"
 	},
 	"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",
+		"@alanscodelog/eslint-config": "5.0.4",
+		"@alanscodelog/semantic-release-config": "^5.0.4",
+		"@alanscodelog/tsconfigs": "^6.0.0",
 		"@commitlint/cli": "^19.6.1",
-		"@electric-sql/pglite": "^0.2.12",
-		"@types/node": "^22.10.2",
-		"@vitest/coverage-v8": "^2.1.8",
+		"@electric-sql/pglite": "^0.3.4",
+		"@types/node": "^24.0.13",
+		"@vitest/coverage-v8": "^3.1.1",
 		"concurrently": "^9.1.0",
 		"cross-env": "^7.0.3",
-		"drizzle-kit": "^0.30.1",
-		"drizzle-orm": "^0.38.2",
+		"drizzle-kit": "^0.31.0",
+		"drizzle-orm": "^0.44.3",
 		"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",
+		"semantic-release": "^24.2.7",
 		"ts-node": "^10.9.1",
-		"typedoc": "0.27.5",
-		"typescript": "~5.7.2",
-		"vite": "^6.0.2",
-		"vite-plugin-externalize-deps": "^0.8.0",
+		"typedoc": "0.28.7",
+		"typescript": "~5.8.3",
+		"vite": "^7.1.3",
+		"vite-plugin-externalize-deps": "^0.9.0",
 		"vite-tsconfig-paths": "^5.1.4",
-		"vitest": "^2.1.8"
+		"vitest": "^3.1.1"
 	},
 	"author": "Alan <alanscodelog@gmail.com>",
 	"repository": "https://github.com/witchcraftjs/expressit",
@@ -143,12 +143,11 @@
 	},
 	"browserslist": "defaults and supports es6-module,maintained node versions",
 	"engines": {
-		"node": ">=18.0.0"
+		"node": ">=20.0.0"
 	},
 	"@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"
 		}