@witchcraft/expressit 0.2.1 → 0.3.0

package/dist/ast/handlers.js

@@ -67,7 +67,7 @@ function condition(not, property, { propertyOperator, sepL, sepR } = {}, value)
   const start = (not == null ? void 0 : not.start) ?? (property == null ? void 0 : property.start) ?? (sepL == null ? void 0 : sepL.start) ?? (propertyOperator == null ? void 0 : propertyOperator.start) ?? (sepR == null ? void 0 : sepR.start) ?? (value == null ? void 0 : value.start);
   const end = (value == null ? void 0 : value.end) ?? (sepR == null ? void 0 : sepR.end) ?? (propertyOperator == null ? void 0 : propertyOperator.end) ?? (sepL == null ? void 0 : sepL.end) ?? (property == null ? void 0 : property.end) ?? (not == null ? void 0 : not.end);
   const node = {
-    value: value ? value : error(end, [TOKEN_TYPE.VALUE]),
+    value: value ?? error(end, [TOKEN_TYPE.VALUE]),
     start,
     end
   };
@@ -80,15 +80,15 @@ function condition(not, property, { propertyOperator, sepL, sepR } = {}, value)
     node.sep = {};
     if (sepL) {
       node.sep.left = sepL;
-      node.property || (node.property = error(sepL.start, [TOKEN_TYPE.VALUE]));
-      node.propertyOperator || (node.propertyOperator = error((sepL == null ? void 0 : sepL.end) ?? (sepR == null ? void 0 : sepR.start), [TOKEN_TYPE.VALUE]));
+      node.property ?? (node.property = error(sepL.start, [TOKEN_TYPE.VALUE]));
+      node.propertyOperator ?? (node.propertyOperator = error((sepL == null ? void 0 : sepL.end) ?? (sepR == null ? void 0 : 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(((_a = node.value) == null ? void 0 : _a.start) ?? end, [TOKEN_TYPE.OP_EXPANDED_SEP]);
     }
   } else if (propertyOperator) {
-    node.property || (node.property = error(propertyOperator.start, [TOKEN_TYPE.VALUE]));
+    node.property ?? (node.property = error(propertyOperator.start, [TOKEN_TYPE.VALUE]));
   }
   return createConditionNode(node);
 }

package/dist/examples/ParserWithSqlSupport.d.ts

@@ -0,0 +1,62 @@
+import { Parser } from "../Parser.js";
+import { type NormalizedCondition, type NormalizedExpression, type Position } from "../types/ast.js";
+export interface BasePropertyDefinition {
+    name: string;
+    /** Supported types are: string, boolean, int, float, date. */
+    type: string;
+    /** Return how to access the column in the WHERE condition of the SQL query, useful for json properties. It is up to you to properly quote the value if needed. */
+    transformToColumn?: (key: string, name: string) => string;
+    /**
+     * A function that can be used to transform the value before it is inserted into the SQL query. Useful for types like arrays. It is up to you to properly escape values if you use the second parameter which contains the unescaped value.
+     */
+    transformValue?: (value: any, unescapedValue: any) => any | any[];
+    isArray?: boolean;
+    /** If undefined, it's assumed all operators are supported. This should only include the final operator (see {@link BaseOperatorDefinition.operator}), it doesn't need to include it's aliases. */
+    supportedOperators?: string[];
+    /** Further transform the value after the basic parsing has been done. Useful to, for example, parse other strings (e.g. now, today, tomorrow) as dates. */
+    postParse?: (value: any) => any;
+}
+export interface BaseOperatorDefinition {
+    /** The final operator to use in the SQL query and while evaluating. */
+    operator: string;
+    /** All aliases the user can use to specify the operator. They need not include the real final operator. */
+    operators: string[];
+    /** All negated aliases to the operator. If an operator is listed here, it will be used to "invert" a condition when normalizing. e.g. < can list >= as a negated operator. This greatly simplifies queries. */
+    negatedOperators?: string[];
+    /** How to compare the value when evualuating a condition. This is only used if using `evaluate`. */
+    valueComparer: (condition: any, contextValue: any) => boolean;
+}
+export type SqlParserError = "invalidKey" | "unknownProperty" | "unknownOperator" | "unknownOperatorForType" | "invalidValueType";
+export declare class ParserWithSqlSupport<TErrorToken extends Position & {
+    type: SqlParserError;
+    message?: string;
+} = Position & {
+    type: SqlParserError;
+    message?: string;
+}, TPropertyDefinition extends BasePropertyDefinition = BasePropertyDefinition, TPropertyDefinitions extends Record<string, TPropertyDefinition> = Record<string, TPropertyDefinition>, TOperatorDefinition extends BaseOperatorDefinition = BaseOperatorDefinition, TOperatorDefinitions extends Record<string, TOperatorDefinition> = Record<string, TOperatorDefinition>, TSqlEscapeValue extends (value: string) => any | ReturnType<TSqlEscapeValue> = (value: string) => any> extends Parser<TErrorToken> {
+    sqlEscapeValue: TSqlEscapeValue;
+    operatorMap: Record<string, string>;
+    propertyDefinitions: TPropertyDefinitions;
+    operatorDefinitions: TOperatorDefinitions;
+    constructor(propertyDefinitions: TPropertyDefinitions, operatorDefinitions: TOperatorDefinitions, { sqlEscapeValue }: {
+        sqlEscapeValue: TSqlEscapeValue;
+    });
+    toSql<T>(ast: NormalizedExpression<any, any> | NormalizedCondition<any, any>, 
+    /**
+     * Optionally convert the raw strings to something else. If uding drizzle, you can pass sql.raw here. So later you can just sql.join the return of the function:
+     *
+     * ```ts
+     * sql.join([
+     * 	sql.raw(db.select().from(someTable).toSQL().sql),
+     * 	sql.raw(`where`),
+     * 	...parser.toSql(ast, sql.raw)
+     * ], sql` `)
+     * ```
+     */
+    wrapStrings?: (value: string) => T): (ReturnType<TSqlEscapeValue> | typeof wrapStrings extends undefined ? string : T)[];
+}
+export declare function createTypeError(prop: string, type: string, isArray: boolean): Error;
+export declare function convertAndValidateValue(isQuoted: boolean, value: any, prop: string, propertyDefinitions: Record<string, BasePropertyDefinition>, { isArray }?: {
+    isArray?: boolean;
+}): any;
+//# sourceMappingURL=ParserWithSqlSupport.d.ts.map

package/dist/examples/ParserWithSqlSupport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ParserWithSqlSupport.d.ts","sourceRoot":"","sources":["../../src/examples/ParserWithSqlSupport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAY,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,KAAK,QAAQ,EAAa,MAAM,iBAAiB,CAAA;AAEzH,MAAM,WAAW,sBAAsB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,8DAA8D;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,kKAAkK;IAClK,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACzD;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,KAAK,GAAG,GAAG,GAAG,EAAE,CAAA;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,kMAAkM;IAClM,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC7B,2JAA2J;IAC3J,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;CAC/B;AACD,MAAM,WAAW,sBAAsB;IACtC,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAA;IAChB,2GAA2G;IAC3G,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,+MAA+M;IAC/M,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC3B,oGAAoG;IACpG,aAAa,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,KAAK,OAAO,CAAA;CAC7D;AACD,MAAM,MAAM,cAAc,GACvB,YAAY,GACZ,iBAAiB,GACjB,iBAAiB,GACjB,wBAAwB,GACxB,kBAAkB,CAAA;AAiBrB,qBAAa,oBAAoB,CAAC,WAAW,SAC5C,QAAQ,GAAG;IACV,IAAI,EAAE,cAAc,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,GACD,QAAQ,GAAG;IACV,IAAI,EAAE,cAAc,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,EACD,mBAAmB,SAAS,sBAAsB,GAAG,sBAAsB,EAC3E,oBAAoB,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACtG,mBAAmB,SAAS,sBAAsB,GAAG,sBAAsB,EAC3E,oBAAoB,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACtG,eAAe,SAAS,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CACpG,SAAQ,MAAM,CAAC,WAAW,CAAC;IAC5B,cAAc,EAAE,eAAe,CAAA;IAE/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEnC,mBAAmB,EAAE,oBAAoB,CAAA;IAEzC,mBAAmB,EAAE,oBAAoB,CAAA;gBAGxC,mBAAmB,EAAE,oBAAoB,EACzC,mBAAmB,EAAE,oBAAoB,EACzC,EAAE,cAAc,EAAE,EAAE;QAAE,cAAc,EAAE,eAAe,CAAA;KAAE;IAkKxD,KAAK,CAAC,CAAC,EACN,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC;IACnE;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,GAChC,CAAC,UAAU,CAAC,eAAe,CAAC,GAAG,OAAO,WAAW,SAAS,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC,EAAE;CA6CtF;AACD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAKnF;AAED,wBAAgB,uBAAuB,CACtC,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC3D,EAAE,OAAe,EAAE,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7C,GAAG,CAwDL"}

package/dist/examples/ParserWithSqlSupport.js

@@ -0,0 +1,271 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { unreachable } from "@alanscodelog/utils/unreachable.js";
+import { Parser } from "../Parser.js";
+import { AST_TYPE, TOKEN_TYPE } from "../types/ast.js";
+class ParserWithSqlSupport extends Parser {
+  constructor(propertyDefinitions, operatorDefinitions, { sqlEscapeValue }) {
+    const operators = [];
+    const operatorMap = {};
+    for (const value of Object.values(operatorDefinitions)) {
+      for (const operator of value.operators) {
+        operatorMap[operator] = value.operator;
+        operators.push(operator);
+      }
+      if (value.negatedOperators) {
+        for (const operator of value.negatedOperators) {
+          operatorMap[operator] = value.operator;
+          operators.push(operator);
+        }
+      }
+    }
+    super({
+      arrayValues: true,
+      regexValues: false,
+      keywords: {
+        and: [{ isSymbol: true, value: "&&" }],
+        or: [{ isSymbol: true, value: "||" }],
+        not: [{ isSymbol: true, value: "!" }]
+      },
+      customPropertyOperators: operators,
+      prefixableGroups: false,
+      valueComparer: (condition, contextValue, _context) => {
+        var _a;
+        if (typeof condition.value !== typeof contextValue) {
+          throw new Error(`Expected type of property ${condition.property[0]} to be the same type as the context value ${contextValue} (${typeof contextValue}). If the ast has been validated this is likely because the type of the context value is incorrect.`);
+        }
+        const prop = condition.property[0];
+        if (!prop) unreachable("Did you validate the ast before evaluating it?");
+        const propDefinition = propertyDefinitions[prop];
+        const operatorDefinition = condition.operator && operatorDefinitions[condition.operator];
+        if (!operatorDefinition) unreachable("Did you validate the ast before evaluating it?");
+        const isSupported = !((_a = propDefinition.supportedOperators) == null ? void 0 : _a.includes(condition.operator));
+        if (!isSupported) unreachable("Did you validate the ast before evaluating it?");
+        const res = operatorDefinition.valueComparer(condition, contextValue);
+        return res;
+      },
+      valueValidator: (_contextValue, query) => {
+        var _a, _b, _c;
+        const prop = query.propertyKeys[0];
+        let tokens = [];
+        const propDefinition = propertyDefinitions[prop];
+        if (!propDefinition) {
+          tokens = tokens.concat(query.property.map((token) => ({
+            start: token.start,
+            end: token.end,
+            type: "unknownProperty"
+          })));
+          return tokens;
+        }
+        const op = query.operator;
+        const opKey = op && operatorMap[op.value];
+        if (!op || !opKey) {
+          tokens.push({
+            start: (_a = op ?? query.condition) == null ? void 0 : _a.start,
+            end: (_b = op ?? query.condition) == null ? void 0 : _b.end,
+            type: "unknownOperator"
+          });
+        } else {
+          if (propDefinition.supportedOperators && !((_c = propDefinition.supportedOperators) == null ? void 0 : _c.includes(opKey))) {
+            tokens.push({
+              start: query.condition.start,
+              end: query.condition.end,
+              type: "unknownOperatorForType"
+            });
+          }
+        }
+        const val = query.value;
+        if (Array.isArray(val)) {
+          for (const v of val) {
+            if (v.type !== "VARIABLE") unreachable();
+            const res2 = convertAndValidateValue(query.isQuoted, v.value.value, prop, propertyDefinitions, { isArray: true });
+            if (res2 instanceof Error) {
+              if (v.type !== "VARIABLE") unreachable();
+              const token = v;
+              tokens.push({
+                start: token.start,
+                end: token.end,
+                type: "invalidValueType",
+                message: res2.message
+              });
+            }
+          }
+          if (tokens.length > 0) return tokens;
+          return;
+        }
+        if ((val == null ? void 0 : val.type) !== "VARIABLE") unreachable();
+        const value = val.value.value;
+        const res = convertAndValidateValue(query.isQuoted, value, prop, propertyDefinitions);
+        if (res instanceof Error) {
+          if (!query.value || query.value.type !== "VARIABLE") unreachable();
+          const token = query.value.value;
+          tokens.push({
+            start: token.start,
+            end: token.end,
+            type: "invalidValueType",
+            message: res.message
+          });
+        }
+        if (tokens.length > 0) return tokens;
+      },
+      conditionNormalizer(query) {
+        var _a, _b;
+        const prop = (_a = query.property) == null ? void 0 : _a[0];
+        if (!prop) unreachable("Did you validate the ast before normalizing it?");
+        const propDefinition = propertyDefinitions[prop];
+        let finalValue;
+        if (Array.isArray(query.value)) {
+          const values = [];
+          if (query.condition.value.type !== AST_TYPE.ARRAY) unreachable();
+          const raw = query.condition.value.values;
+          for (let i = 0; i < query.value.length; i += 1) {
+            const token = raw[i];
+            const val = query.value[i];
+            const isQuoted = !!token.quote;
+            const res = convertAndValidateValue(isQuoted, val, prop, propertyDefinitions, { isArray: true });
+            if (res instanceof Error) throw res;
+            values.push(res);
+          }
+          finalValue = values;
+        } else {
+          finalValue = convertAndValidateValue(query.isQuoted, query.value, prop, propertyDefinitions);
+          if (propDefinition.isArray) {
+            finalValue = [finalValue];
+          }
+        }
+        let finalOperator = query.operator;
+        if (finalValue instanceof Error) throw finalValue;
+        const opKey = query.operator && operatorMap[query.operator];
+        if (!opKey) unreachable("Did you validate the ast before normalizing it?");
+        const operatorDefinition = opKey && operatorDefinitions[opKey];
+        if (!operatorDefinition) unreachable("Did you validate the ast before normalizing it?");
+        const isNegatableOperator = (_b = operatorDefinition.negatedOperators) == null ? void 0 : _b.includes(query.operator);
+        finalOperator = operatorDefinition.operator;
+        let isNegated = query.isNegated;
+        if (isNegatableOperator) {
+          isNegated = !isNegated;
+        }
+        return { value: finalValue, operator: finalOperator, negate: isNegated };
+      }
+    });
+    __publicField(this, "sqlEscapeValue");
+    __publicField(this, "operatorMap");
+    __publicField(this, "propertyDefinitions");
+    __publicField(this, "operatorDefinitions");
+    this.propertyDefinitions = propertyDefinitions;
+    this.operatorDefinitions = operatorDefinitions;
+    this.operatorMap = operatorMap;
+    this.sqlEscapeValue = sqlEscapeValue;
+  }
+  toSql(ast, wrapStrings) {
+    var _a, _b;
+    this._checkEvaluationOptions();
+    const chunks = [];
+    if (ast.type === AST_TYPE.NORMALIZED_CONDITION) {
+      const prop = (_a = ast.property) == null ? void 0 : _a[0];
+      const definition = this.propertyDefinitions[prop];
+      const value = ast.value;
+      const col = ((_b = definition.transformToColumn) == null ? void 0 : _b.call(definition, prop, definition.name)) ?? `"${prop}"`;
+      const op = ast.operator;
+      if (ast.negate) {
+        chunks.push((wrapStrings == null ? void 0 : wrapStrings(`NOT(`)) ?? `NOT(`);
+      }
+      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`${col} `)) ?? `${col} `);
+      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`${op} `)) ?? `${op} `);
+      const val = this.sqlEscapeValue(value);
+      if (definition.transformValue) {
+        const transformed = definition.transformValue(val, value);
+        if (Array.isArray(transformed)) {
+          chunks.push(...transformed);
+        } else {
+          chunks.push(transformed);
+        }
+      } else {
+        chunks.push(val);
+      }
+      if (ast.negate) {
+        chunks.push((wrapStrings == null ? void 0 : wrapStrings(`)`)) ?? `)`);
+      }
+      return chunks;
+    }
+    if (ast.type === AST_TYPE.NORMALIZED_EXPRESSION) {
+      const left = this.toSql(ast.left, wrapStrings);
+      const right = this.toSql(ast.right, wrapStrings);
+      const op = ast.operator === TOKEN_TYPE.AND ? "AND" : "OR";
+      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`(`)) ?? `(`);
+      chunks.push(...left);
+      chunks.push((wrapStrings == null ? void 0 : wrapStrings(` ${op} `)) ?? ` ${op} `);
+      chunks.push(...right);
+      chunks.push((wrapStrings == null ? void 0 : wrapStrings(`)`)) ?? `)`);
+      return chunks;
+    }
+    return unreachable();
+  }
+}
+function createTypeError(prop, type, isArray) {
+  if (isArray) {
+    return new Error(`Property ${prop} must contain items of type ${type}.`);
+  }
+  return new Error(`Property ${prop} must be of type ${type}.`);
+}
+function convertAndValidateValue(isQuoted, value, prop, propertyDefinitions, { isArray = false } = {}) {
+  var _a;
+  let finalValue = value;
+  let isFloat = false;
+  const propDefinition = propertyDefinitions[prop];
+  if (typeof value === "string" && !isQuoted) {
+    if (finalValue === "true") {
+      finalValue = true;
+    } else if (finalValue === "false") {
+      finalValue = false;
+    } else {
+      const asNum = parseInt(value, 10);
+      if (!isNaN(asNum)) {
+        finalValue = asNum;
+      } else {
+        const asFloat = parseFloat(value);
+        if (!isNaN(asFloat)) {
+          finalValue = asFloat;
+          isFloat = true;
+        }
+      }
+    }
+  }
+  const type = propDefinition.type;
+  finalValue = ((_a = propDefinition.postParse) == null ? void 0 : _a.call(propDefinition, finalValue)) ?? finalValue;
+  switch (type) {
+    case "integer":
+    case "float": {
+      if (typeof finalValue !== "number" || type === "float" && !isFloat || type === "integer" && isFloat) {
+        return createTypeError(prop, type, isArray);
+      }
+      break;
+    }
+    case "string":
+    case "boolean": {
+      if (typeof finalValue !== propDefinition.type) {
+        return createTypeError(prop, type, isArray);
+      }
+      break;
+    }
+    case "date": {
+      if (finalValue instanceof Date) {
+        break;
+      }
+      const maybeDate = new Date(finalValue);
+      if (isNaN(maybeDate.getTime())) {
+        return createTypeError(prop, "date", isArray);
+      } else {
+        finalValue = maybeDate;
+      }
+      break;
+    }
+  }
+  return finalValue;
+}
+export {
+  ParserWithSqlSupport,
+  convertAndValidateValue,
+  createTypeError
+};

package/dist/examples/{shortcutContextParser.d.ts → ShortcutContextParser.d.ts}

@@ -1,3 +1,5 @@
+import { Parser } from "../Parser.js";
+import type { Position } from "../types/ast.js";
 /**
  * A pre-configured parser for parsing shortcut contexts (similar to VSCode's [when clause contexts](https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts)).
  *
@@ -7,17 +9,15 @@
  *
  * The validate function will return a list of positions with a list of errors which includes handling invalid or duplicate regex flags.
  */
-import { Parser } from "../Parser.js";
-import type { Position } from "../types/ast.js";
-export declare class ShortcutContextParser<T extends Position & {
+export declare class ShortcutContextParser<TErrorTokens extends Position & {
     type: ("invalidKey" | "unregexableKey" | "invalidRegexFlag" | "duplicateRegexFlag");
 } = Position & {
     type: ("invalidKey" | "unregexableKey" | "invalidRegexFlag" | "duplicateRegexFlag");
-}> extends Parser<T> {
+}> extends Parser<TErrorTokens> {
     validKeys: string[];
     regexablekeys: string[];
     constructor(dummyContext: Record<string, any>, validRegexFlags?: string[]);
     setContext(context: Record<string, any>): void;
     private _extractKeysFromContext;
 }
-//# sourceMappingURL=shortcutContextParser.d.ts.map
+//# sourceMappingURL=ShortcutContextParser.d.ts.map

package/dist/examples/ShortcutContextParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ShortcutContextParser.d.ts","sourceRoot":"","sources":["../../src/examples/ShortcutContextParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAI/C;;;;;;;;GAQG;AAGH,qBAAa,qBAAqB,CAAC,YAAY,SAC9C,QAAQ,GAAG;IAAE,IAAI,EAAE,CAAC,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,oBAAoB,CAAC,CAAA;CAAE,GAClG,QAAQ,GAAG;IAAE,IAAI,EAAE,CAAC,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,oBAAoB,CAAC,CAAA;CAAE,CACjG,SAAQ,MAAM,CAAC,YAAY,CAAC;IAC7B,SAAS,EAAE,MAAM,EAAE,CAAK;IAExB,aAAa,EAAE,MAAM,EAAE,CAAK;gBAG3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,eAAe,GAAE,MAAM,EAAoB;IAmG5C,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAK9C,OAAO,CAAC,uBAAuB;CAa/B"}

package/dist/examples/{shortcutContextParser.js → ShortcutContextParser.js}

@@ -70,7 +70,7 @@ class ShortcutContextParser extends Parser {
         let finalValue = value;
         let finalOperator = operator;
         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";
@@ -109,7 +109,7 @@ class ShortcutContextParser extends Parser {
     for (const key of Object.keys(context)) {
       if (typeof context[key] === "boolean") {
         this.validKeys.push(prev ? `${prev}.${key}` : key);
-        if (context[key] === true) {
+        if (context[key]) {
           this.regexablekeys.push(prev ? `${prev}.${key}` : key);
         }
       } else {

package/dist/examples/index.d.ts

@@ -1,2 +1,3 @@
-export { ShortcutContextParser } from "./shortcutContextParser.js";
+export { ShortcutContextParser } from "./ShortcutContextParser.js";
+export { ParserWithSqlSupport } from "./ParserWithSqlSupport.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/examples/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/examples/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA"}

package/dist/examples/index.js

@@ -1,4 +1,6 @@
-import { ShortcutContextParser } from "./shortcutContextParser.js";
+import { ShortcutContextParser } from "./ShortcutContextParser.js";
+import { ParserWithSqlSupport } from "./ParserWithSqlSupport.js";
 export {
+  ParserWithSqlSupport,
   ShortcutContextParser
 };

package/dist/index.js

@@ -2,12 +2,12 @@ import * as index from "./ast/index.js";
 import { Parser } from "./Parser.js";
 import { AST_TYPE, TOKEN_TYPE } from "./types/ast.js";
 import { SUGGESTION_TYPE } from "./types/autocomplete.js";
-import { ERROR_CODES } from "./types/errors.js";
+import { PARSER_ERROR } from "./types/errors.js";
 import * as index$1 from "./utils/index.js";
 import * as index$2 from "./defaults/index.js";
 export {
   AST_TYPE,
-  ERROR_CODES,
+  PARSER_ERROR,
   Parser,
   SUGGESTION_TYPE,
   TOKEN_TYPE,

package/dist/internal/ExpressitError.d.ts

@@ -1,6 +1,6 @@
-import type { ERROR_CODES, ErrorInfo } from "../types/errors.js";
+import type { ErrorInfo, ParserError } from "../types/errors.js";
 /** @internal */
-export declare class ExpressitError<T extends ERROR_CODES> extends Error {
+export declare class ExpressitError<T extends ParserError> extends Error {
     version: string;
     repo: string;
     type: T;

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

@@ -1 +1 @@
-{"version":3,"file":"ExpressitError.d.ts","sourceRoot":"","sources":["../../src/internal/ExpressitError.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEhE,gBAAgB;AAChB,qBAAa,cAAc,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,KAAK;IAC/D,OAAO,EAAE,MAAM,CAAU;IAEzB,IAAI,EAAE,MAAM,CAAa;IAEzB,IAAI,EAAE,CAAC,CAAA;IAEP,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;gBAEN,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM;CAYzD"}
+{"version":3,"file":"ExpressitError.d.ts","sourceRoot":"","sources":["../../src/internal/ExpressitError.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhE,gBAAgB;AAChB,qBAAa,cAAc,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,KAAK;IAC/D,OAAO,EAAE,MAAM,CAAU;IAEzB,IAAI,EAAE,MAAM,CAAa;IAEzB,IAAI,EAAE,CAAC,CAAA;IAEP,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;gBAEN,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM;CAYzD"}

package/dist/internal/ExpressitError.js

@@ -4,7 +4,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 import { crop } from "@alanscodelog/utils/crop.js";
 import { indent } from "@alanscodelog/utils/indent.js";
 import { pretty } from "@alanscodelog/utils/pretty.js";
-import { version, repository } from "../package.js";
+import packageJson from "../package.json.js";
+const { version, repository } = packageJson;
 class ExpressitError extends Error {
   constructor(type, info, message) {
     super(

package/dist/internal/checkParserOpts.d.ts

@@ -1,4 +1,4 @@
 import type { FullParserOptions } from "../types/parser.js";
 /** @internal */
-export declare function checkParserOpts<T extends {}>(opts: FullParserOptions<T>, evaluatorChecks?: boolean, validatorChecks?: boolean): void;
+export declare function checkParserOpts<T>(opts: FullParserOptions<T>, evaluatorChecks?: boolean, validatorChecks?: boolean): void;
 //# sourceMappingURL=checkParserOpts.d.ts.map

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

@@ -3,7 +3,7 @@ import { pushIfNotIn } from "@alanscodelog/utils/pushIfNotIn.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 { PARSER_ERROR } from "../types/errors.js";
 function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   if (!evaluatorChecks) {
@@ -20,7 +20,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     if (opts.customPropertyOperators) pushIfNotIn(extra, opts.customPropertyOperators);
     if (opts.expandedPropertySeparator && isBlank(opts.expandedPropertySeparator)) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+        PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
         { prohibited: [""], invalid: opts.expandedPropertySeparator },
         `expandedPropertySeparator cannot be blank`
       );
@@ -28,7 +28,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     const customInvalid = (_a = opts.customPropertyOperators) == null ? void 0 : _a.find((_) => isBlank(_));
     if (customInvalid !== void 0) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+        PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
         { prohibited: [""], invalid: customInvalid },
         `customPropertyOperators cannot contain blank entries`
       );
@@ -36,7 +36,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     const prefixInvalid = (_b = opts.prefixableStrings) == null ? void 0 : _b.find((_) => isBlank(_));
     if (prefixInvalid !== void 0) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+        PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
         { prohibited: [""], invalid: prefixInvalid },
         `prefixableStrings cannot contain blank entries`
       );
@@ -45,7 +45,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
       const invalid = (_d = (_c = opts.keywords[key]) == null ? void 0 : _c.find((_) => isBlank(_.value))) == null ? void 0 : _d.value;
       if (invalid !== void 0) {
         throw new ExpressitError(
-          ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+          PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
           { prohibited: [""], invalid },
           `keywords.${key} cannot contain entries with blank values`
         );
@@ -58,7 +58,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     const invalidPrefixableString = (_e = opts.prefixableStrings) == null ? void 0 : _e.find((val) => all.includes(val));
     if (invalidPrefixableString) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+        PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
         { prohibited: all, invalid: invalidPrefixableString },
         `prefixableStrings ${messageInvalidAny} "${invalidPrefixableString}"`
       );
@@ -66,7 +66,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     const invalidExpandedPropertySeparator = allKeywords.find((_) => _ === opts.expandedPropertySeparator);
     if (invalidExpandedPropertySeparator) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+        PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
         { prohibited: allKeywords, invalid: invalidExpandedPropertySeparator },
         `expandedPropertySeparator ${messageInvalidBool} "${invalidExpandedPropertySeparator}"`
       );
@@ -74,7 +74,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     const invalidCustomPropertyOperator = ((_f = opts.customPropertyOperators) == null ? void 0 : _f.find((val) => keywords.includes(val))) ? opts.expandedPropertySeparator : void 0;
     if (invalidCustomPropertyOperator) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_CONFLICTING_OPTIONS_ERROR,
+        PARSER_ERROR.CONFLICTING_OPTIONS_ERROR,
         { prohibited: keywords, invalid: invalidCustomPropertyOperator },
         `customPropertyOperator ${messageInvalidBool} "${invalidCustomPropertyOperator}"`
       );
@@ -88,7 +88,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     if (opts.regexValues) requireCustomNormalizer.push("regexValues");
     if (requireCustomNormalizer.length > 0 && opts.conditionNormalizer === defaultConditionNormalizer) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
+        PARSER_ERROR.OPTION_REQUIRED_ERROR,
         { options: requireCustomNormalizer, requires: "conditionNormalizer" },
         `A custom conditionNormalizer function must be specified when using the following options: ${requireCustomNormalizer.join(", ")}`
       );
@@ -98,7 +98,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
     if (opts.regexValues) requireCustomComparer.push("arrayValues");
     if (requireCustomComparer.length > 0 && opts.valueComparer === defaultValueComparer) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
+        PARSER_ERROR.OPTION_REQUIRED_ERROR,
         { options: requireCustomComparer, requires: "valueComparer" },
         `A custom valueComparer function must be specified when using the following options: ${requireCustomComparer.join(", ")}`
       );
@@ -107,7 +107,7 @@ function checkParserOpts(opts, evaluatorChecks = false, validatorChecks = false)
   if (validatorChecks) {
     if (opts.valueValidator === void 0) {
       throw new ExpressitError(
-        ERROR_CODES.PARSER_OPTION_REQUIRED_ERROR,
+        PARSER_ERROR.OPTION_REQUIRED_ERROR,
         { requires: "valueValidator" },
         `A custom valueValidator function must be specified when using the validate method.`
       );

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"}