@witchcraft/expressit 0.1.3 → 0.2.1

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,53 @@
+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

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

@@ -1 +1 @@
-{"version":3,"file":"getCursorInfo.d.ts","sourceRoot":"","sources":["../../src/utils/getCursorInfo.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACnE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1D;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,aAAa,GAAG,QAAQ,EAAE,EAC/B,KAAK,EAAE,MAAM,GACX,UAAU,CAoDZ"}
+{"version":3,"file":"getCursorInfo.d.ts","sourceRoot":"","sources":["../../src/utils/getCursorInfo.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACnE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1D;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,aAAa,GAAG,QAAQ,EAAE,EAC/B,KAAK,EAAE,MAAM,GACX,UAAU,CAoDZ"}

package/dist/utils/getCursorInfo.js

@@ -1,8 +1,6 @@
 import { isArray } from "@alanscodelog/utils/isArray.js";
 import { unreachable } from "@alanscodelog/utils/unreachable.js";
 import { extractTokens } from "./extractTokens.js";
-import { ErrorToken } from "../ast/classes/ErrorToken.js";
-import { ValidToken } from "../ast/classes/ValidToken.js";
 function getCursorInfo(input, ast, index) {
   const tokens = isArray(ast) ? ast : extractTokens(ast);
   if (input.length < index || index < 0) {
@@ -24,7 +22,7 @@ function getCursorInfo(input, ast, index) {
   };
   for (const token of tokens) {
     if (token.end <= index) {
-      if (token instanceof ValidToken) {
+      if (token.valid) {
         info.prev = token;
         info.valid.prev = token;
       } else if (token.end !== index) {
@@ -32,7 +30,7 @@ function getCursorInfo(input, ast, index) {
       }
     }
     if (token.start < index && token.end > index) {
-      if (token instanceof ErrorToken) {
+      if (!token.valid) {
         unreachable();
       } else {
         info.at = token;
@@ -40,7 +38,7 @@ function getCursorInfo(input, ast, index) {
     }
     if (token.start >= index) {
       info.next || (info.next = token);
-      if (token instanceof ValidToken && !info.valid.next) {
+      if (token.valid && !info.valid.next) {
         info.valid.next = token;
         break;
       }
@@ -57,28 +55,20 @@ function setWhitespaceBetween(input, index, side, info) {
   if (info.at) {
     if (info.valid[side]) {
       const nextTokStart = info.valid[side][oppositePos];
-      if (info.at[pos] !== nextTokStart)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (info.at[pos] !== nextTokStart) info.whitespace[side] = true;
+      else return;
     } else {
-      if (info.at[pos] !== limit)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (info.at[pos] !== limit) info.whitespace[side] = true;
+      else return;
     }
   } else {
     if (info.valid[side]) {
       const nextTokStart = info.valid[side][oppositePos];
-      if (index !== nextTokStart)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (index !== nextTokStart) info.whitespace[side] = true;
+      else return;
     } else {
-      if (index !== limit)
-        info.whitespace[side] = true;
-      else
-        return;
+      if (index !== limit) info.whitespace[side] = true;
+      else return;
     }
   }
 }

package/dist/utils/getOppositeDelimiter.d.ts

@@ -1,6 +1,7 @@
+import type { generateParentsMap } from "./generateParentsMap.js";
 import { type AnyToken, type TokenDelimiterTypes } 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): AnyToken<TokenDelimiterTypes> | undefined;
+export declare function getOppositeDelimiter(token: AnyToken, parentsMap: ReturnType<typeof generateParentsMap>): AnyToken<TokenDelimiterTypes> | 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":"AAWA,OAAO,EAAE,KAAK,QAAQ,EAAc,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErF;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,mBAAmB,CAAC,GAAG,SAAS,CAsB/F"}
+{"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"}

package/dist/utils/getOppositeDelimiter.js

@@ -4,27 +4,25 @@ import { isDelimiter } from "./isDelimiter.js";
 import { isParen } from "./isParen.js";
 import { isQuote } from "./isQuote.js";
 import { TOKEN_TYPE } from "../types/ast.js";
-function getOppositeDelimiter(token) {
-  if (!isDelimiter(token))
-    throw new Error("Token is not a delimiter type.");
+function getOppositeDelimiter(token, parentsMap) {
+  const parent = parentsMap.get(token);
+  if (!isDelimiter(token)) throw new Error("Token is not a delimiter type.");
   if (isParen(token)) {
-    const paren = token.parent.paren;
+    const paren = parent.paren;
     const opposite = paren.left === token ? "right" : "left";
     return paren[opposite];
   } else if (isBracket(token)) {
-    const bracket = token.parent.bracket;
+    const bracket = parent.bracket;
     const opposite = bracket.left === token ? "right" : "left";
     return bracket[opposite];
   } else if (isQuote(token)) {
-    const quotes = token.parent.quote;
-    if (quotes === void 0)
-      unreachable();
+    const quotes = parent.quote;
+    if (quotes === void 0) unreachable();
     const opposite = quotes.left === token ? "right" : "left";
     return quotes[opposite];
   } else if (token.type === TOKEN_TYPE.OP_EXPANDED_SEP) {
-    const sep = token.parent.sep;
-    if (sep === void 0)
-      unreachable();
+    const sep = parent.sep;
+    if (sep === void 0) unreachable();
     const opposite = sep.left === token ? "right" : "left";
     return sep[opposite];
   }

package/dist/utils/getParent.d.ts

@@ -0,0 +1,5 @@
+import type { generateParentsMap } from "./generateParentsMap.js";
+import type { AnyToken, ArrayNode, ConditionNode, ExpressionNode, GroupNode, ParentTypes, VariableNode } from "../types/ast.js";
+/** See {@link generateParentsMap} */
+export declare function getParent<T extends ExpressionNode | ConditionNode | GroupNode | VariableNode | ArrayNode | AnyToken | undefined>(node: T, map: ReturnType<typeof generateParentsMap>): ParentTypes<T> | undefined;
+//# sourceMappingURL=getParent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getParent.d.ts","sourceRoot":"","sources":["../../src/utils/getParent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAC,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9H,qCAAqC;AACrC,wBAAgB,SAAS,CACxB,CAAC,SACC,cAAc,GACd,aAAa,GACb,SAAS,GACT,YAAY,GACZ,SAAS,GACT,QAAQ,GACR,SAAS,EACV,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAEjF"}

package/dist/utils/getParent.js

@@ -0,0 +1,6 @@
+function getParent(node, map) {
+  return map.get(node);
+}
+export {
+  getParent
+};

package/dist/utils/getSurroundingErrors.d.ts

@@ -1,9 +1,9 @@
 /**
- * Mostly for internal use by @see autosuggest.
+ * Mostly for internal use by {@link autosuggest}.
  *
  * Returns all error tokens immediately before/after cursor (since there might be multiple error tokens one after the other).
  *
- * The errors are sorted by closeness to the given cursor (inside @see CursorInfo), with quote errors having priority, then paren errors, then any other errors. They can be sorted by closeness because although two errors might follow each other, their positions might be different because of whitespace, but they can still be fixed from any cursor position between their ends.
+ * The errors are sorted by closeness to the given cursor (inside {@link CursorInfo}), with quote errors having priority, then paren errors, then any other errors. They can be sorted by closeness because although two errors might follow each other, their positions might be different because of whitespace, but they can still be fixed from any cursor position between their ends.
  *
  * For example:
  * ```
@@ -18,8 +18,7 @@
  * either insertion would fix the issue for either position would fix the issue, albeit with different results
  * ```
  */
-import { ErrorToken } from "../ast/classes/ErrorToken.js";
-import { type AnyToken } from "../types/ast.js";
+import { type AnyToken, type ErrorToken } from "../types/ast.js";
 import type { CursorInfo } from "../types/autocomplete.js";
 export declare function getSurroundingErrors(tokens: AnyToken[], token: CursorInfo): ErrorToken[];
 //# sourceMappingURL=getSurroundingErrors.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getSurroundingErrors.d.ts","sourceRoot":"","sources":["../../src/utils/getSurroundingErrors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAc,MAAM,iBAAiB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,EAAE,CA8BxF"}
+{"version":3,"file":"getSurroundingErrors.d.ts","sourceRoot":"","sources":["../../src/utils/getSurroundingErrors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,KAAK,QAAQ,EAAC,KAAK,UAAU,EAAa,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAG1D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,EAAE,CAgCxF"}

package/dist/utils/getSurroundingErrors.js

@@ -1,6 +1,6 @@
-import { ErrorToken } from "../ast/classes/ErrorToken.js";
 import { TOKEN_TYPE } from "../types/ast.js";
 function getSurroundingErrors(tokens, token) {
+  var _a, _b;
   if (token.at) {
     return [];
   }
@@ -8,11 +8,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 (tokens[iNext] instanceof ErrorToken) {
+  while (((_a = tokens[iNext]) == null ? void 0 : _a.valid) === false) {
     errors.push(tokens[iNext]);
     iNext++;
   }
-  while (tokens[iPrev] instanceof ErrorToken) {
+  while (((_b = tokens[iPrev]) == null ? void 0 : _b.valid) === false) {
     errors.push(tokens[iPrev]);
     iPrev--;
   }

package/dist/utils/index.d.ts

@@ -1,10 +1,14 @@
 export { extractTokens } from "./extractTokens.js";
+export { generateParentsMap } from "./generateParentsMap.js";
 export { getCursorInfo } from "./getCursorInfo.js";
 export { getOppositeDelimiter } from "./getOppositeDelimiter.js";
+export { getParent } from "./getParent.js";
 export { getSurroundingErrors } from "./getSurroundingErrors.js";
 export { isBracket } from "./isBracket.js";
 export { isDelimiter } from "./isDelimiter.js";
+export { isNode } from "./isNode.js";
 export { isParen } from "./isParen.js";
 export { isQuote } from "./isQuote.js";
+export { isToken } from "./isToken.js";
 export { prettyAst } from "./prettyAst.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/utils/index.js

@@ -1,20 +1,28 @@
 import { extractTokens } from "./extractTokens.js";
+import { generateParentsMap } from "./generateParentsMap.js";
 import { getCursorInfo } from "./getCursorInfo.js";
 import { getOppositeDelimiter } from "./getOppositeDelimiter.js";
+import { getParent } from "./getParent.js";
 import { getSurroundingErrors } from "./getSurroundingErrors.js";
 import { isBracket } from "./isBracket.js";
 import { isDelimiter } from "./isDelimiter.js";
+import { isNode } from "./isNode.js";
 import { isParen } from "./isParen.js";
 import { isQuote } from "./isQuote.js";
+import { isToken } from "./isToken.js";
 import { prettyAst } from "./prettyAst.js";
 export {
   extractTokens,
+  generateParentsMap,
   getCursorInfo,
   getOppositeDelimiter,
+  getParent,
   getSurroundingErrors,
   isBracket,
   isDelimiter,
+  isNode,
   isParen,
   isQuote,
+  isToken,
   prettyAst
 };

package/dist/utils/isNode.d.ts

@@ -0,0 +1,10 @@
+import type { Node } from "../types/ast.js";
+/**
+ * A simple wrapper around checking an object's `isNode` property that casts the object to a {@link Nodes} type for typescript.
+ *
+ * Does not actually do any checking of the object, and assumes the object was created using one of the `create*` functions.
+ *
+ * Also note that passing a NormalizedCondition or NormalizedExpression will return false even though they have their own {@link AST_TYPE} since they are not technically nodes (with positions).
+ */
+export declare function isNode(node: any): node is Node;
+//# sourceMappingURL=isNode.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isNode.d.ts","sourceRoot":"","sources":["../../src/utils/isNode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,IAAI,CAE9C"}

package/dist/utils/isNode.js

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

package/dist/utils/isToken.d.ts

@@ -0,0 +1,8 @@
+import type { ErrorToken, ValidToken } from "../types/ast.js";
+/**
+ * A simple wrapper around checking an object's `isToken` property that casts the object to a {@link ValidToken} or {@link ErrorToken} for typescript.
+ *
+ * Does not actually do any checking of the object, and assumes the object was created using one of the `create*` functions.
+ */
+export declare function isToken(token: any): token is ValidToken | ErrorToken;
+//# sourceMappingURL=isToken.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isToken.d.ts","sourceRoot":"","sources":["../../src/utils/isToken.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE7D;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,UAAU,GAAG,UAAU,CAEpE"}

package/dist/utils/isToken.js

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

package/dist/utils/prettyAst.d.ts

@@ -1,5 +1,4 @@
-import { ArrayNode, GroupNode, VariableNode } from "../ast/classes/index.js";
-import { type AnyToken, type ParserResults } from "../types/ast.js";
+import { type AnyToken, type ArrayNode, type GroupNode, type ParserResults, type VariableNode } from "../types/ast.js";
 type Colors = {
     /** Color used to highlight the actual text content of the token nodes. */
     values: string;

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

@@ -1 +1 @@
-{"version":3,"file":"prettyAst.d.ts","sourceRoot":"","sources":["../../src/utils/prettyAst.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAA6C,SAAS,EAAc,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACnI,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAc,MAAM,iBAAiB,CAAA;AAG/E,KAAK,MAAM,GAAG;IACb,0EAA0E;IAC1E,MAAM,EAAE,MAAM,CAAA;IACd,6NAA6N;IAC7N,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,mKAAmK;IACnK,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAA;CACb,CAAA;AAoBD;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAAgB,SAAS,CACxB,GAAG,EAAE,aAAa,GAAG,QAAQ,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,EACpE,EAAE,MAAc,EAAE,QAAe,EAAE,IAAW,EAAE,MAAY,EAAE,KAAU,EAAE,GAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,EAAE,MAAM,CAAC,CAAM,EAC7J,MAAM,GAAE,OAAO,CAAC,MAAM,CAAC,GAAG,KAAU,GAClC,MAAM,CAyFR"}
+{"version":3,"file":"prettyAst.d.ts","sourceRoot":"","sources":["../../src/utils/prettyAst.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAA8B,KAAK,SAAS,EAAE,KAAK,aAAa,EAAc,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9J,KAAK,MAAM,GAAG;IACb,0EAA0E;IAC1E,MAAM,EAAE,MAAM,CAAA;IACd,6NAA6N;IAC7N,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,mKAAmK;IACnK,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAA;CACb,CAAA;AAoBD;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAAgB,SAAS,CACxB,GAAG,EAAE,aAAa,GAAG,QAAQ,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,EACpE,EAAE,MAAc,EAAE,QAAe,EAAE,IAAW,EAAE,MAAY,EAAE,KAAU,EAAE,GAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,EAAE,MAAM,CAAC,CAAM,EAC7J,MAAM,GAAE,OAAO,CAAC,MAAM,CAAC,GAAG,KAAU,GAClC,MAAM,CA2FR"}

package/dist/utils/prettyAst.js

@@ -2,17 +2,8 @@ import * as color from "@alanscodelog/utils/colors.js";
 import { isBlank } from "@alanscodelog/utils/isBlank.js";
 import "@alanscodelog/utils/types";
 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 "@alanscodelog/utils/crop.js";
-import "@alanscodelog/utils/indent.js";
-import "@alanscodelog/utils/pretty.js";
-import { ValidToken } from "../ast/classes/ValidToken.js";
-import { VariableNode } from "../ast/classes/VariableNode.js";
-import { TOKEN_TYPE } from "../types/ast.js";
+import { isToken } from "./isToken.js";
+import { AST_TYPE, TOKEN_TYPE } from "../types/ast.js";
 const defaultColors = {
   values: color.yellow,
   info: color.cyan,
@@ -37,28 +28,29 @@ function prettyAst(ast, { indent = "   ", children = "├╴", last = "└╴",
   const _ = indent;
   const __ = arguments[3] ?? "";
   let extra = arguments[4] ?? "";
-  if (!isBlank(extra))
-    extra = ` ${c.hint}${extra}${c.reset}`;
+  if (!isBlank(extra)) extra = ` ${c.hint}${extra}${c.reset}`;
   const ___ = __ + _ + branch;
   const __L = __ + _ + indent[0];
   const prettyAst_ = prettyAst;
-  if (ast instanceof ValidToken) {
-    const value = `${ast.value}`;
-    return `TOKEN ${pos} ${c.values}${quote}${value}${quote}${c.reset}${extra}`;
+  if (isToken(ast)) {
+    if (ast.valid) {
+      const value = `${ast.value}`;
+      return `TOKEN ${pos} ${c.values}${quote}${value}${quote}${c.reset}${extra}`;
+    }
+    if (!ast.valid) {
+      const value = `[${ast.expected.join(", ")}]`;
+      return `ERROR ${pos} ${c.error}${value}${c.reset}${extra}`;
+    }
   }
-  if (ast instanceof ErrorToken) {
-    const value = `[${ast.expected.join(", ")}]`;
-    return `ERROR ${pos} ${c.error}${value}${c.reset}${extra}`;
-  }
-  if (ast instanceof ConditionNode) {
+  if (ast.type === AST_TYPE.CONDITION) {
     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 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 instanceof VariableNode && ((_c = ast.value.quote) == null ? void 0 : _c.left.type) === TOKEN_TYPE.REGEX;
-    const isArray = ast.value instanceof ArrayNode;
+    const isRegex = ast.value.type === AST_TYPE.VARIABLE && ((_c = ast.value.quote) == null ? void 0 : _c.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 [
       `CONDITION ${pos} ${header}${extra}`,
@@ -66,7 +58,7 @@ function prettyAst(ast, { indent = "   ", children = "├╴", last = "└╴",
     ].join(`
 ${__}`);
   }
-  if (ast instanceof VariableNode) {
+  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 : ___, "");
@@ -78,7 +70,7 @@ ${__}`);
     ].join(`
 ${__}`);
   }
-  if (ast instanceof GroupNode) {
+  if (ast.type === AST_TYPE.GROUP) {
     const header = `${c.info}${ast.prefix === void 0 || ast.prefix.operator === void 0}${c.reset}`;
     const prefix = ast.prefix ? prettyAst_(ast.prefix, opts, c, ___, `(group prefix)`) : "";
     const expression = prettyAst_(ast.expression, opts, c, __L, "");
@@ -88,7 +80,7 @@ ${__}`);
     ].join(`
 ${__}`);
   }
-  if (ast instanceof ArrayNode) {
+  if (ast.type === AST_TYPE.ARRAY) {
     const bracketL = ast.bracket.left ? prettyAst_(ast.bracket.left, opts, c, ast.values.length === 0 && !ast.bracket.right ? __L : ___, "") : "";
     const values = ast.values.length > 0 ? ast.values.map(
       (node, i) => prettyAst_(node, opts, c, !ast.bracket.right && i === ast.values.length - 1 ? __L : ___, "")
@@ -100,11 +92,11 @@ ${__}`);
     ].join(`
 ${__}`);
   }
-  if (ast instanceof ExpressionNode) {
+  if (ast.type === AST_TYPE.EXPRESSION) {
     const left = prettyAst_(ast.left, opts, c, ___, "");
     const operator = prettyAst_(ast.operator, opts, c, ___, `(boolean operator)`);
     const right = prettyAst_(ast.right, opts, c, __L, "");
-    const header = ast.operator instanceof ErrorToken ? `${c.info}[${ast.operator.expected.join(",")}]${c.reset}` : `${c.info}"${ast.operator.value}"${c.reset}`;
+    const header = !ast.operator.valid ? `${c.info}[${ast.operator.expected.join(",")}]${c.reset}` : `${c.info}"${ast.operator.value}"${c.reset}`;
     return [
       `EXPRESSION ${pos} ${header}${extra}`,
       ...toRows([left, operator, right], opts)

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.1.3",
+	"version": "0.2.1",
 	"types": "./dist/index.d.ts",
 	"type": "module",
 	"module": "./dist/index.js",
@@ -19,13 +19,13 @@
 			"types": "./dist/ast/*",
 			"import": "./dist/ast/*"
 		},
-		"./helpers": {
-			"types": "./dist/helpers/index.d.ts",
-			"import": "./dist/helpers/index.js"
+		"./internal": {
+			"types": "./dist/internal/index.d.ts",
+			"import": "./dist/internal/index.js"
 		},
-		"./helpers/*": {
-			"types": "./dist/helpers/*",
-			"import": "./dist/helpers/*"
+		"./internal/*": {
+			"types": "./dist/internal/*",
+			"import": "./dist/internal/*"
 		},
 		"./methods": {
 			"types": "./dist/methods/index.d.ts",

package/src/Lexer.ts

@@ -1,8 +1,8 @@
 import { isBlank } from "@alanscodelog/utils/isBlank.js"
 import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn.js"
 
-import { checkParserOpts } from "./helpers/parser/checkParserOpts.js"
-import { parseParserOptions } from "./helpers/parser/parseParserOptions.js"
+import { checkParserOpts } from "./internal/checkParserOpts.js"
+import { parseParserOptions } from "./internal/parseParserOptions.js"
 import type { FullParserOptions } from "./types/index.js"
 
 const regexFlags = /^[a-zA-Z]+/