sql-love 1.0.5 → 1.1.0

package/dist/index.mjs

@@ -1,31 +1,15 @@
 // src/Parser/Parser.ts
-var Parser = class {
+class Parser {
   query;
-  /**
-   * Create a new instance
-   * @param query  A Select object on which to build parsed conditions
-   */
   constructor(query) {
     this.query = query;
   }
-  /**
-   * Strip single-line and multi-line comment blocks
-   * @param sql  The SQL string
-   * @return  The SQL string without comments
-   * @private
-   */
   _stripComments(sql) {
     sql = sql.replace(/\/\*[\s\S]*?\*\//g, "");
     sql = sql.replace(/--([\r\n]|\s+[^\r\n]+[\r\n])/g, "");
     sql = sql.replace(/#[^\r\n]+[\r\n]/g, "");
     return sql;
   }
-  /**
-   * Before splitting into SQL clauses, extract some regex-able subQueries
-   * @param sql  The unparsed sql string
-   * @return  An array with new sql and subQueries
-   * @private
-   */
   _extractSubQueries(sql) {
     const subQueries = {};
     let i = 0;
@@ -39,11 +23,6 @@ var Parser = class {
     sql = sql.replace(/\bIN\s*\(\s*SELECT\s.+?\)/, extractor);
     return { sql, subQueries };
   }
-  /**
-   * Inject column subQueries back into this object
-   * @param subQueries  The lookup of extracted subQueries
-   * @private
-   */
   _injectSubQueries(subQueries) {
     const replacer = ($0) => {
       return subQueries[$0] || $0;
@@ -56,21 +35,10 @@ var Parser = class {
     this.query._wheres = this.query._wheres.map(mapper);
     this.query._havings = this.query._havings.map(mapper);
   }
-  /**
-   * Split SQL into clauses (used by parse())
-   * @param sql  The SQL to split
-   * @return
-   * @private
-   */
   _split(sql) {
     const splitter = /(?:^|\s)(SELECT|FROM|(?:INNER|LEFT\s+OUTER|RIGHT\s+OUTER|LEFT|RIGHT|CROSS|FULL|FULL\s+OUTER)\s+JOIN|WHERE|GROUP\s+BY|HAVING|ORDER\s+BY|LIMIT|OFFSET|FETCH\s+NEXT)\b/i;
     return sql.split(splitter);
   }
-  /**
-   * Get a QuickSelect object representing the given SQL SELECT statement
-   * @param  rawSql  The raw SQL for the SELECT statement
-   * @return True if the SQL was parsed successfully
-   */
   parse(rawSql) {
     const stripped = this._stripComments(rawSql);
     const { sql, subQueries } = this._extractSubQueries(stripped);
@@ -86,11 +54,6 @@ var Parser = class {
     this._injectSubQueries(subQueries);
     return true;
   }
-  /**
-   * Handle SQL_CALC_FOUND_ROWS and column names
-   * @param clause  The clause after the SELECT
-   * @private
-   */
   _handleSELECT(clause) {
     let columns = clause.split(/s*,s*/);
     let buffer = "";
@@ -118,84 +81,34 @@ var Parser = class {
       }
     });
   }
-  /**
-   * Handle table names
-   * @param clause  The clause after the FROM
-   * @private
-   */
   _handleFROM(clause) {
     const tables = clause.split(/\s*,\s*/);
     tables.forEach((table) => this.query.table(table));
   }
-  /**
-   * Handle INNER JOIN statements
-   * @param clause  The clause after the INNER JOIN
-   * @private
-   */
   _handleINNER_JOIN(clause) {
     this.query.innerJoin(clause);
   }
-  /**
-   * Handle LEFT JOIN statements
-   * @param clause  The clause after the LEFT JOIN
-   * @private
-   */
   _handleLEFT_JOIN(clause) {
     this.query.leftJoin(clause);
   }
-  /**
-   * Handle LEFT OUTER JOIN statements
-   * @param clause  The clause after the LEFT OUTER JOIN
-   * @private
-   */
   _handleLEFT_OUTER_JOIN(clause) {
     this.query.leftOuterJoin(clause);
   }
-  /**
-   * Handle RIGHT JOIN statements
-   * @param clause  The clause after the RIGHT JOIN
-   * @private
-   */
   _handleRIGHT_JOIN(clause) {
     this.query.rightJoin(clause);
   }
-  /**
-   * Handle RIGHT OUTER JOIN statements
-   * @param clause  The clause after the RIGHT OUTER JOIN
-   * @private
-   */
   _handleRIGHT_OUTER_JOIN(clause) {
     this.query.rightOuterJoin(clause);
   }
-  /**
-   * Handle CROSS JOIN statements
-   * @param clause  The clause after the CROSS JOIN
-   * @private
-   */
   _handleCROSS_JOIN(clause) {
     this.query.crossJoin(clause);
   }
-  /**
-   * Handle FULL JOIN statements
-   * @param clause  The clause after the FULL JOIN
-   * @private
-   */
   _handleFULL_JOIN(clause) {
     this.query.fullJoin(clause);
   }
-  /**
-   * Handle FULL OUTER JOIN statements
-   * @param clause  The clause after the FULL OUTER JOIN
-   * @private
-   */
   _handleFULL_OUTER_JOIN(clause) {
     this.query.fullOuterJoin(clause);
   }
-  /**
-   * Handle WHERE conditions
-   * @param clause  All the conditions after WHERE
-   * @private
-   */
   _handleWHERE(clause) {
     if (/^(1|'1'|true)$/i.test(clause)) {
       this.query._wheres.push(clause);
@@ -203,20 +116,9 @@ var Parser = class {
       this._handleConditions("where", clause);
     }
   }
-  /**
-   * Handle HAVING statements
-   * @param clause  All the conditions after HAVING
-   * @private
-   */
   _handleHAVING(clause) {
     this._handleConditions("having", clause);
   }
-  /**
-   * Build a conditions list
-   * @param type  Either where or having
-   * @param clause  The expressions following the type keyword
-   * @private
-   */
   _handleConditions(type, clause) {
     const andGroups = clause.split(/\bAND\b/i);
     andGroups.forEach((andGroup) => {
@@ -230,29 +132,14 @@ var Parser = class {
       }
     });
   }
-  /**
-   * Handle GROUP BY statements
-   * @param clause  The clauses after the GROUP BY
-   * @private
-   */
   _handleGROUP_BY(clause) {
     const columns = clause.split(/\s*,\s*/);
     columns.forEach((column) => this.query.groupBy(column));
   }
-  /**
-   * Handle ORDER BY statements
-   * @param clause  The clause after the ORDER BY
-   * @private
-   */
   _handleORDER_BY(clause) {
     const columns = clause.split(/\s*,\s*/);
     columns.forEach((column) => this.query.orderBy(column));
   }
-  /**
-   * Handle LIMIT statements including "LIMIT #" and "LIMIT #, #"
-   * @param clause  The clause after the LIMIT
-   * @private
-   */
   _handleLIMIT(clause) {
     const offsetLimit = clause.match(/^(\d+|\?|:\w+)\s*,\s*(\d+|\?|:\w+)$/);
     if (offsetLimit) {
@@ -263,26 +150,15 @@ var Parser = class {
       this.query.limit(clause);
     }
   }
-  /**
-   * Handle OFFSET statements
-   * @param clause  The number after the OFFSET
-   * @private
-   */
   _handleOFFSET(clause) {
     clause = clause.replace(/^(\d+) ROWS$/i, "$1");
     this.query.offset(clause);
   }
-  /**
-   * Handle OFFSET statements
-   * @param clause  The number after the OFFSET
-   * @private
-   */
   _handleFETCH_NEXT(clause) {
     clause = clause.replace(/^(\d+) ROWS ONLY$/i, "$1");
     this.query.limit(clause);
   }
-};
-
+}
 // src/substrCount/substrCount.ts
 function substrCount(haystack, needle) {
   let count = 0;
@@ -295,75 +171,22 @@ function substrCount(haystack, needle) {
 }
 
 // src/SelectBuilder/SelectBuilder.ts
-var isNullish = (v) => v === void 0 || v === null || v === false || isNaN(v);
+var isNullish = (v) => v === undefined || v === null || v === false || isNaN(v);
 var defaultEngine = "mysql";
-var SelectBuilder = class _SelectBuilder {
-  /**
-   * The list of values to bind to the query
-   * @private
-   */
+
+class SelectBuilder {
   _bindings = [];
-  /**
-   * The list of strings to come immediately after "SELECT"
-   * and before column names
-   * @private
-   */
   _options = [];
-  /**
-   * The list of column names to select
-   * @private
-   */
   _tables = [];
-  /**
-   * The list of tables in the FROM clause
-   * @private
-   */
   _columns = [];
-  /**
-   * The list of JOIN strings to add
-   * @private
-   */
   _joins = [];
-  /**
-   * The list of WHERE clauses to join with AND
-   * @private
-   */
   _wheres = [];
-  /**
-   * The list of GROUP BY clauses to join with commas
-   * @private
-   */
   _groupBys = [];
-  /**
-   * The list of HAVING clauses to join with AND
-   * @private
-   */
   _havings = [];
-  /**
-   * The list of ORDER BY clauses to join with commas
-   * @private
-   */
   _orderBys = [];
-  /**
-   * The LIMIT to use
-   * @private
-   */
   _limit;
-  /**
-   * The OFFSET to use
-   * @private
-   */
   _offset;
-  /**
-   * The page used to construct an OFFSET based on the LIMIT
-   * @private
-   */
   _page;
-  /**
-   * Select constructor
-   * @param [sql]  A base SQL query to parse
-   * @param [bindings]  Placeholders to bind to the query
-   */
   constructor(sql = null, bindings = null) {
     if (sql) {
       if (bindings) {
@@ -377,33 +200,32 @@ var SelectBuilder = class _SelectBuilder {
       new Parser(this).parse(sql);
     }
   }
-  /**
-   * Set the default database engine style (mssql, mysql, oracle, pg)
-   * @param engine
-   */
   static setDefaultEngine(engine) {
     defaultEngine = engine;
-    return _SelectBuilder;
+    return SelectBuilder;
   }
-  /**
-   * Get the SQL as a pretty-printed string alongside an array of bindings
-   * @param engine  The database engine style (mssql, mysql, oracle, pg)
-   * @return The SQL query as a string
-   */
   compile({
     engine = defaultEngine,
     bindingIndex = 1
   } = {}) {
     const lines = [
       "SELECT",
-      this._options.length ? `  ${this._options.join("\n  ")}` : null,
-      this._columns.length ? `  ${this._columns.join(",\n  ")}` : "  *\n",
+      this._options.length ? `  ${this._options.join(`
+  `)}` : null,
+      this._columns.length ? `  ${this._columns.join(`,
+  `)}` : `  *
+`,
       `FROM ${this._tables.join(", ")}`,
-      this._joins.length ? this._joins.join("\n") : null,
-      this._wheres.length ? `WHERE ${this._wheres.join("\n  AND ")}` : null,
-      this._groupBys.length ? `GROUP BY ${this._groupBys.join(",\n  ")}` : null,
-      this._havings.length ? `HAVING ${this._havings.join("\n  AND ")}` : null,
-      this._orderBys.length ? `ORDER BY ${this._orderBys.join(",\n  ")}` : null
+      this._joins.length ? this._joins.join(`
+`) : null,
+      this._wheres.length ? `WHERE ${this._wheres.join(`
+  AND `)}` : null,
+      this._groupBys.length ? `GROUP BY ${this._groupBys.join(`,
+  `)}` : null,
+      this._havings.length ? `HAVING ${this._havings.join(`
+  AND `)}` : null,
+      this._orderBys.length ? `ORDER BY ${this._orderBys.join(`,
+  `)}` : null
     ];
     if (this._page > 0) {
       const offset = (this._page - 1) * this._limit;
@@ -417,7 +239,8 @@ var SelectBuilder = class _SelectBuilder {
         lines.push(this._compileLIMIT(engine, this._limit));
       }
     }
-    const pretty = lines.filter(Boolean).join("\n").trim();
+    const pretty = lines.filter(Boolean).join(`
+`).trim();
     let replacer;
     const bindings = [];
     if (engine === "pg") {
@@ -449,11 +272,6 @@ var SelectBuilder = class _SelectBuilder {
       return `OFFSET ${offset} ROWS`;
     }
   }
-  /**
-   * Get SQL needed to return the found rows of this query
-   * @param engineStyle  The database engine style (mssql, mysql, oracle, pg)
-   * @param countExpr  The expression to use inside the COUNT()
-   */
   compileCount({
     countExpr = "*",
     engine = defaultEngine,
@@ -464,7 +282,8 @@ var SelectBuilder = class _SelectBuilder {
     if (this._havings.length === 0) {
       return { sql, bindings };
     } else {
-      const subquerySql = sql.replace(/\n/g, "\n	");
+      const subquerySql = sql.replace(/\n/g, `
+	`);
       return {
         sql: `SELECT COUNT(*) AS found_rows
 FROM (
@@ -474,11 +293,6 @@ ${subquerySql}
       };
     }
   }
-  /**
-   * Get SQL needed to union this query with another
-   * @param query  The query to union
-   * @param engine  The database engine style (mssql, mysql, oracle, pg)
-   */
   compileUnion(query, {
     engine = defaultEngine,
     bindingIndex = 1
@@ -495,11 +309,6 @@ UNION
       bindings: [...first.bindings, ...second.bindings]
     };
   }
-  /**
-   * @param  [fieldOrFields]  If given, reset the given component(s), otherwise reset all query components
-   *   Valid components: option, column, table, where, orWhere, having, groupBy, orderBy, limit, offset, page
-   * @return This object
-   */
   reset(fieldOrFields = null) {
     if (Array.isArray(fieldOrFields)) {
       fieldOrFields.forEach((name) => this.reset(name));
@@ -537,11 +346,8 @@ UNION
     }
     return this;
   }
-  /**
-   * Clone this builder object
-   */
   getClone() {
-    const copy = new _SelectBuilder();
+    const copy = new SelectBuilder;
     copy._options = [...this._options];
     copy._columns = [...this._columns];
     copy._tables = [...this._tables];
@@ -556,10 +362,6 @@ UNION
     copy._bindings = [...this._bindings];
     return copy;
   }
-  /**
-   * Build a version of this query that simply returns COUNT(*)
-   * @param [countExpr="*"]  Use to specify `DISTINCT colname` if needed
-   */
   getFoundRowsQuery(countExpr = "*") {
     if (this._havings.length === 0) {
       const clone = this.getClone();
@@ -579,74 +381,34 @@ UNION
       return subquery;
     }
   }
-  /**
-   * Add an array of column names to fetch
-   * @param columnNames  The names of columns
-   */
   select(columnNames) {
     this._columns = this._columns.concat(columnNames);
     return this;
   }
-  /**
-   * Add an array of column names to fetch
-   * @param columnNames  The names of columns
-   */
   columns(columnNames) {
     this._columns = this._columns.concat(columnNames);
     return this;
   }
-  /**
-   * Add a column name to fetch
-   * @param columnName  The name of the column
-   */
   column(columnName) {
     this._columns.push(columnName);
     return this;
   }
-  /**
-   * Add an option expression such as "TOP 10" or "SQL_CALC_FOUND_ROWS"
-   * @param optionExpression  Expression to go after "SELECT" and before column list
-   */
   option(optionExpression) {
     this._options.push(optionExpression);
     return this;
   }
-  /**
-   * Add a table to the "FROM" clause (same as .from())
-   * @param {String} tableName  The name of the table to query
-   * @return {Select}
-   */
   table(tableName) {
     this._tables.push(tableName);
     return this;
   }
-  /**
-   * Add multiple table to the "FROM" clause
-   * @param {Array} tableNames  The names of the tables to query
-   * @return {Select}
-   */
   tables(tableNames) {
     this._tables.push(...tableNames);
     return this;
   }
-  /**
-   * Add a table to the "FROM" clause (same as .table())
-   * @param {String} tableName  The name of the table to query
-   * @return {Select}
-   */
   from(tableName) {
     this._tables.push(tableName);
     return this;
   }
-  /**
-   * Add the given join type expression
-   * @param joinType  The type of join (e.g. "INNER JOIN", "LEFT JOIN", etc.)
-   * @param expression  The expression following the INNER JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.join('posts p ON p.id = c.post_id');
-   *   query.join('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   _addJoin(joinType, expression, bindings = []) {
     if (bindings.length > 0) {
       expression = expression.replace(/\?/g, () => {
@@ -656,118 +418,42 @@ UNION
     }
     this._joins.push(`${joinType} ${expression}`);
   }
-  /**
-   * Add a JOIN expression
-   * @param expression  The expression following the INNER JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.join('posts p ON p.id = c.post_id');
-   *   query.join('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   join(expression, bindings = []) {
     this._addJoin("JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a LEFT JOIN expression
-   * @param expression  The expression following the LEFT JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.leftJoin('posts p ON p.id = c.post_id');
-   *   query.leftJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   leftJoin(expression, bindings = []) {
     this._addJoin("LEFT JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a FULL JOIN expression
-   * @param expression  The expression following the FULL JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.fullJoin('posts p ON p.id = c.post_id');
-   *   query.fullJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   fullJoin(expression, bindings = []) {
     this._addJoin("FULL JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a RIGHT JOIN expression
-   * @param expression  The expression following the RIGHT JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.rightJoin('posts p ON p.id = c.post_id');
-   *   query.rightJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   rightJoin(expression, bindings = []) {
     this._addJoin("RIGHT JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a CROSS JOIN expression
-   * @param expression  The expression following the CROSS JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.crossJoin('posts p ON p.id = c.post_id');
-   *   query.crossJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   crossJoin(expression, bindings = []) {
     this._addJoin("CROSS JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add an INNER JOIN expression (same as ->join())
-   * @param expression  The expression following the INNER JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.innerJoin('posts p ON p.id = c.post_id');
-   *   query.innerJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   innerJoin(expression, bindings = []) {
     this._addJoin("INNER JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a LEFT OUTER JOIN expression
-   * @param expression  The expression following the LEFT OUTER JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.leftOuterJoin('posts p ON p.id = c.post_id');
-   *   query.leftOuterJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   leftOuterJoin(expression, bindings = []) {
     this._addJoin("LEFT OUTER JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a FULL OUTER JOIN expression
-   * @param expression  The expression following the FULL OUTER JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.fullOuterJoin('posts p ON p.id = c.post_id');
-   *   query.fullOuterJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   fullOuterJoin(expression, bindings = []) {
     this._addJoin("FULL OUTER JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Add a RIGHT OUTER JOIN expression
-   * @param expression  The expression following the RIGHT OUTER JOIN keyword
-   * @param bindings  A list of values to bind to ? placeholders in the expression
-   * @example
-   *   query.rightOuterJoin('posts p ON p.id = c.post_id');
-   *   query.rightOuterJoin('posts p ON p.id = c.post_id AND p.deleted_at < ?', [myDate]);
-   */
   rightOuterJoin(expression, bindings = []) {
     this._addJoin("RIGHT OUTER JOIN", expression, bindings);
     return this;
   }
-  /**
-   * Remove a join condition with the specified table
-   * @param table  The name of the table or tables in the first part of the join statement
-   */
   unjoin(table) {
     if (Array.isArray(table)) {
       table.forEach((t) => this.unjoin(t));
@@ -779,34 +465,6 @@ UNION
     });
     return this;
   }
-  /**
-   * Utility function to add conditions for a clause (WHERE, HAVING)
-   * @param  collection  The collection to add the clauses to (e.g. this._wheres or this._havings)
-   * @param  criteria  Criteria adhering to WhereCriteria type
-   * @example  The following are equivalent
-   *   this._conditions(this._wheres, ['deleted_at IS NULL']);
-   *   this._conditions(this._wheres, ['deleted_at', null]);
-   *   this._conditions(this._wheres, ['deleted_at', '=', null]);
-   * @example  More examples
-   *   this._conditions(this._wheres, ['fname', 'LIKE', 'joe']); // `fname` LIKE 'joe'
-   *   this._conditions(this._wheres, ['fname', 'LIKE ?', 'joe']); // `fname` LIKE 'joe'
-   *   this._conditions(this._wheres, ['fname LIKE %?%', 'joe']); // `fname` LIKE '%joe%'
-   *   this._conditions(this._wheres, ['fname LIKE ?%', 'joe']); // `fname` LIKE 'joe%'
-   *   this._conditions(this._wheres, ['fname', 'LIKE ?%', 'joe']); // `fname` LIKE 'joe%'
-   *   this._conditions(this._wheres, ['price >', 10]); // `price` > 10
-   *   this._conditions(this._wheres, ['price', '>', 10]); // `price` > 10
-   *   this._conditions(this._wheres, ['price =', 10]); // `price` = 10
-   *   this._conditions(this._wheres, ['price !=', 10]); // `price` != 10
-   *   this._conditions(this._wheres, ['price', 10]); // `price` = 10
-   *   this._conditions(this._wheres, ['price', '=', 10]); // `price` = 10
-   *   this._conditions(this._wheres, ['price', '!=', 10]); // `price` != 10
-   *   this._conditions(this._wheres, ['price', 'BETWEEN', [10,20]]); // `price` BETWEEN 10 AND 20
-   *   this._conditions(this._wheres, ['price', 'NOT BETWEEN', [10,20]]); // `price` NOT BETWEEN 10 AND 20
-   *   this._conditions(this._wheres, ['price', [10,20]]); // `price` IN(10,20)
-   *   this._conditions(this._wheres, ['price', '=', [10,20]]); // `price` IN(10,20)
-   *   this._conditions(this._wheres, ['price', 'IN', [10,20]]); // `price` IN(10,20)
-   *   this._conditions(this._wheres, ['price', 'NOT IN', [10,20]]); // `price` NOT IN(10,20)
-   */
   _conditions(collection, criteria) {
     const numArgs = criteria.length;
     let [column, operator, value] = criteria;
@@ -837,15 +495,11 @@ UNION
       operator = "=";
     }
     operator = operator.toLocaleUpperCase();
-    const likeMatch = operator.match(
-      /^(LIKE|NOT LIKE|ILIKE|NOT ILIKE)(?: (\?|\?%|%\?|%\?%))?$/i
-    );
+    const likeMatch = operator.match(/^(LIKE|NOT LIKE|ILIKE|NOT ILIKE)(?: (\?|\?%|%\?|%\?%))?$/i);
     if (operator === "NOT BETWEEN" || operator === "BETWEEN") {
       const one = this._bindings.length;
       const two = this._bindings.length + 1;
-      collection.push(
-        `${column} ${operator} __BOUND_${one}__ AND __BOUND_${two}__`
-      );
+      collection.push(`${column} ${operator} __BOUND_${one}__ AND __BOUND_${two}__`);
       this._bindings.push(value[0], value[1]);
     } else if (likeMatch) {
       const like = likeMatch[1].toUpperCase();
@@ -863,52 +517,32 @@ UNION
         this._bindings.push(infix.replace("?", value || ""));
       }
     } else if (value === null) {
-      collection.push(
-        operator === "=" ? `${column} IS NULL` : `${column} IS NOT NULL`
-      );
+      collection.push(operator === "=" ? `${column} IS NULL` : `${column} IS NOT NULL`);
     } else if (Array.isArray(value)) {
       const inVals = [];
-      for (let i = 0; i < value.length; i++) {
+      for (let i = 0;i < value.length; i++) {
         inVals.push(`__BOUND_${this._bindings.length}__`);
         this._bindings.push(value[i]);
       }
       const joined = inVals.join(", ");
-      collection.push(
-        operator === "=" || operator === "IN" ? `${column} IN(${joined})` : `${column} NOT IN(${joined})`
-      );
+      collection.push(operator === "=" || operator === "IN" ? `${column} IN(${joined})` : `${column} NOT IN(${joined})`);
     } else if (operator === "IN" || operator === "NOT IN") {
-      collection.push(
-        `${column} ${operator}(__BOUND_${this._bindings.length}__)`
-      );
+      collection.push(`${column} ${operator}(__BOUND_${this._bindings.length}__)`);
       this._bindings.push(value);
     } else {
-      collection.push(
-        `${column} ${operator} __BOUND_${this._bindings.length}__`
-      );
+      collection.push(`${column} ${operator} __BOUND_${this._bindings.length}__`);
       this._bindings.push(value);
     }
     return this;
   }
-  /**
-   * Add a group by column or expression
-   * @param column  The name of a column (or expression) to group by
-   */
   groupBy(column) {
     this._groupBys.push(column);
     return this;
   }
-  /**
-   * Add WHERE clauses to conditions (See _conditions for usage)
-   */
   where(...args) {
     this._conditions(this._wheres, args);
     return this;
   }
-  /**
-   * Add a WHERE clause with a BETWEEN condition
-   * @param column  The column name
-   * @param twoValueArray  The two values to be between
-   */
   whereBetween(column, twoValueArray) {
     if (!isNullish(twoValueArray[0]) && !isNullish(twoValueArray[1])) {
       this.where(column, "BETWEEN", twoValueArray);
@@ -916,14 +550,9 @@ UNION
       this.where(column, ">=", twoValueArray[0]);
     } else if (isNullish(twoValueArray[0]) && !isNullish(twoValueArray[1])) {
       this.where(column, "<=", twoValueArray[1]);
-    } else {
-    }
+    } else {}
     return this;
   }
-  /**
-   * Add a series of WHERE clauses joined by OR (See _conditions for usage)
-   * @param conditions
-   */
   _orConditions(conditions) {
     const items = [];
     if (Array.isArray(conditions)) {
@@ -948,41 +577,20 @@ UNION
       return joined;
     }
   }
-  /**
-   * Add WHERE conditions to place inside an OR block (See _conditions for usage)
-   * @param conditions  A list or object where each item is an array with parameters that would be taken by where()
-   */
   orWhere(conditions) {
     const joined = this._orConditions(conditions);
     this.where(`(${joined})`);
     return this;
   }
-  /**
-   * Add an OR with conditions under the HAVING clause
-   * @param conditions  A list or object where each item is an array with parameters that would be taken by having()
-   */
   orHaving(conditions) {
     const joined = this._orConditions(conditions);
     this.having(`(${joined})`);
     return this;
   }
-  /**
-   * Add a HAVING condition (See _conditions for usage)
-   */
   having(...args) {
     this._conditions(this._havings, args);
     return this;
   }
-  /**
-   * Add a column or expression to order by
-   * @param column  The column name or expression to sort by. Include DESC or prefix with - to sort descending
-   * @param [direction]  The direction to sort by (ASC or DESC)
-   * @example
-   *   query.sortField('modified_at'); // ORDER BY modified_at
-   *   query.sortField('-modified_at'); // ORDER BY modified_at DESC
-   *   query.sortField('COUNT(*)'); // ORDER BY COUNT(*)
-   *   query.sortField('COUNT(*) DESC'); // ORDER BY COUNT(*) DESC
-   */
   orderBy(column, direction = null) {
     if (direction) {
       this._orderBys.push(`${column} ${direction}`);
@@ -992,44 +600,33 @@ UNION
     }
     return this;
   }
-  /**
-   * Sort by the given column, with a map of columns to translate
-   * @param fieldName  The file name such as "created_at" or "-created_at" for descending
-   * @param [mapNames]  Column names to translate from field to column expression
-   * @example
-   *   query.sortField('-modified_at'); // ORDER BY modified_at DESC
-   *   query.sortField('-created', {'created': 'created_at'}); // ORDER BY created_at DESC
-   */
-  sortField(fieldName, mapNames = {}) {
+  sortField(fieldName, mapNames = {}, modifier = "") {
+    if (!fieldName) {
+      return this;
+    }
     let direction = "ASC";
     if (fieldName.startsWith("-")) {
+      if (mapNames[fieldName]) {
+        const maybeModifier = modifier ? ` ${modifier}` : "";
+        this.orderBy(mapNames[fieldName] + maybeModifier);
+        return this;
+      }
       direction = "DESC";
       fieldName = fieldName.slice(1);
     }
     const column = mapNames[fieldName] || fieldName;
+    if (modifier) {
+      direction += ` ${modifier}`;
+    }
     this.orderBy(column, direction);
     return this;
   }
-  /**
-   * Check to see if the given string is 0 or all digits not starting with 0
-   * @param string  The input string
-   * @private
-   */
   _isEntirelyDigits(string) {
     return /^(0|[1-9]\d*)$/.test(string);
   }
-  /**
-   * Check to see if the given string is all digits
-   * @param string  The input string
-   * @private
-   */
   _isEntirelyDigitsNoZeros(string) {
     return /^[1-9]\d*$/.test(string);
   }
-  /**
-   * Limit results to the given number
-   * @param max  The number to limit by (placeholder string or integer greater than 0)
-   */
   limit(max) {
     if (typeof max === "string") {
       max = max.trim();
@@ -1039,55 +636,38 @@ UNION
     } else if (typeof max === "number" && Number.isInteger(max) && max >= 1) {
       this._limit = max;
     } else {
-      throw new Error(
-        `SelectBuilder: "limit(n)" must receive a positive integer (got "${max}")`
-      );
+      throw new Error(`SelectBuilder: "limit(n)" must receive a positive integer (got "${max}")`);
     }
     return this;
   }
-  /**
-   * Fetch results from the given offset
-   * @param number  The offset (placeholder string or integer greater than or equal to 0)
-   */
   offset(number) {
     if (typeof number === "string" && this._isEntirelyDigits(number.trim())) {
       this._offset = parseInt(number, 10);
     } else if (typeof number === "number" && Number.isInteger(number) && number >= 0) {
       this._offset = number;
     } else {
-      throw new Error(
-        `SelectBuilder: "offset(n)" must receive a positive integer (got "${number}")`
-      );
+      throw new Error(`SelectBuilder: "offset(n)" must receive a positive integer (got "${number}")`);
     }
     return this;
   }
-  /**
-   * Set the offset based on the limit with the given page number
-   * @param number  The page number (integer greater than 0)
-   */
   page(number) {
     if (typeof number === "string" && this._isEntirelyDigitsNoZeros(number.trim())) {
       this._page = parseInt(number, 10);
     } else if (typeof number === "number" && Number.isInteger(number) && number >= 1) {
       this._page = number;
     } else {
-      throw new Error(
-        'SelectBuilder: "page(n)" must receive a positive integer'
-      );
+      throw new Error('SelectBuilder: "page(n)" must receive a positive integer');
     }
     return this;
   }
-};
-
+}
 // src/extractGrouped/extractGrouped.ts
 function extractGrouped(field, records) {
   let idx = 0;
   const grouped = {};
   for (const record of records) {
     if (!(field in record)) {
-      throw new Error(
-        `Column "${String(field)}" is not present in record ${idx}`
-      );
+      throw new Error(`Column "${String(field)}" is not present in record ${idx}`);
     }
     if (!grouped[record[field]]) {
       grouped[record[field]] = [];
@@ -1097,44 +677,35 @@ function extractGrouped(field, records) {
   }
   return grouped;
 }
-
 // src/extractIndexed/extractIndexed.ts
 function extractIndexed(field, records) {
   let idx = 0;
   const indexed = {};
   for (const record of records) {
     if (!(field in record)) {
-      throw new Error(
-        `Column "${String(field)}" is not present in record ${idx}`
-      );
+      throw new Error(`Column "${String(field)}" is not present in record ${idx}`);
     }
     indexed[record[field]] = record;
     idx++;
   }
   return indexed;
 }
-
 // src/extractLookup/extractLookup.ts
 function extractLookup(keyField, valueField, records) {
   const lookup = {};
   let idx = 0;
   for (const record of records) {
     if (!(keyField in record)) {
-      throw new Error(
-        `Column "${String(keyField)}" is not present in record ${idx}`
-      );
+      throw new Error(`Column "${String(keyField)}" is not present in record ${idx}`);
     }
     if (!(valueField in record)) {
-      throw new Error(
-        `Column "${String(valueField)}" is not present in record ${idx}`
-      );
+      throw new Error(`Column "${String(valueField)}" is not present in record ${idx}`);
     }
     idx++;
     lookup[String(record[keyField])] = record[valueField];
   }
   return lookup;
 }
-
 // src/getPagination/getPagination.ts
 function getPagination(query, total) {
   total = Number(total) || 0;
@@ -1167,7 +738,6 @@ function getPagination(query, total) {
     isLast
   };
 }
-
 // src/runMysql/runMysql.ts
 function _queryToPromise(mysqlClient, sql, bindings) {
   return new Promise((resolve, reject) => {
@@ -1218,7 +788,6 @@ async function runMysqlAsyncWithCount(mysqlClient, query, {
     return { records, total: 0, pagination: getPagination(query, 0), fields };
   }
 }
-
 // src/toSafeJson/toSafeJson.ts
 function toSafeJsonValue(value) {
   if (typeof value === "bigint") {
@@ -1245,19 +814,16 @@ function toSafeJsonString(records) {
 }
 
 // src/runPrisma/runPrisma.ts
-async function runPrisma(prisma, query, { engine = void 0 } = {}) {
+async function runPrisma(prisma, query, { engine = undefined } = {}) {
   const { sql, bindings } = query.compile({ engine });
   return prisma.$queryRawUnsafe(sql, ...bindings);
 }
 async function runPrismaWithCount(prisma, query, {
-  engine = void 0,
+  engine = undefined,
   countExpr = "*"
 } = {}) {
   const { sql, bindings } = query.compile({ engine });
-  const records = await prisma.$queryRawUnsafe(
-    sql,
-    ...bindings
-  );
+  const records = await prisma.$queryRawUnsafe(sql, ...bindings);
   if (records.length > 0) {
     const { sql: sql2, bindings: bindings2 } = query.compileCount({ engine, countExpr });
     const result = await prisma.$queryRawUnsafe(sql2, ...bindings2);
@@ -1268,20 +834,20 @@ async function runPrismaWithCount(prisma, query, {
   }
 }
 export {
-  Parser,
-  SelectBuilder,
-  extractGrouped,
-  extractIndexed,
-  extractLookup,
-  getPagination,
-  runMysql,
-  runMysqlAsync,
-  runMysqlAsyncWithCount,
-  runMysqlWithCount,
-  runPrisma,
-  runPrismaWithCount,
-  toSafeJsonRecord,
-  toSafeJsonRecords,
+  toSafeJsonValue,
   toSafeJsonString,
-  toSafeJsonValue
+  toSafeJsonRecords,
+  toSafeJsonRecord,
+  runPrismaWithCount,
+  runPrisma,
+  runMysqlWithCount,
+  runMysqlAsyncWithCount,
+  runMysqlAsync,
+  runMysql,
+  getPagination,
+  extractLookup,
+  extractIndexed,
+  extractGrouped,
+  SelectBuilder,
+  Parser
 };