sql-love 1.1.4 → 1.2.0

package/README.md

@@ -1,15 +1,15 @@
-<img alt="SQL Love Logo" src="https://github.com/kensnyder/sql-love/raw/main/assets/sql-love-logo.png?v=1.1.4" width="250" height="208" />
+<img alt="SQL Love Logo" src="https://github.com/kensnyder/sql-love/raw/main/assets/sql-love-logo.png?v=1.2.0" width="250" height="208" />
 
 # sql-love
 
-[![Language](https://badgen.net/static/language/TS?v=1.1.4)](https://github.com/search?q=repo:kensnyder/sql-love++language:TypeScript&type=code)
-[![Code Coverage](https://codecov.io/gh/kensnyder/sql-love/branch/main/graph/badge.svg?v=1.1.4)](https://codecov.io/gh/kensnyder/sql-love)
+[![Language](https://badgen.net/static/language/TS?v=1.2.0)](https://github.com/search?q=repo:kensnyder/sql-love++language:TypeScript&type=code)
+[![Code Coverage](https://codecov.io/gh/kensnyder/sql-love/branch/main/graph/badge.svg?v=1.2.0)](https://codecov.io/gh/kensnyder/sql-love)
 ![Dependencies](https://badgen.net/static/dependencies/0/green)
 ![Tree shakeable](https://badgen.net/static/tree%20shakeable/Yes/green)
 ![Gzip Size](https://badgen.net/static/gzip%20size/9kb/blue)
-[![ISC License](https://badgen.net/static/license/ISC/green?v=1.1.4)](https://opensource.org/licenses/ISC)
+[![ISC License](https://badgen.net/static/license/ISC/green?v=1.2.0)](https://opensource.org/licenses/ISC)
 
-Classes for parsing and building SQL select queries in Node/Bun/Deno.
+Classes for parsing and building SQL select queries in Node/Bun/Workers.
 
 ## Installation
 
@@ -258,6 +258,8 @@ query.where('status', 'NOT IN', ['pending', 'approved']);
 query.where({ status: ['pending', 'approved'] });
 query.where({ 'status NOT IN': ['pending', 'approved'] });
 query.where({ 'status !=': ['pending', 'approved'] });
+// IN and NOT IN with an empty array add no condition at all
+query.where('status', 'IN', []); // (omitted)
 query.where({ 'status <>': ['pending', 'approved'] });
 
 // Question marks for binding

package/dist/index.cjs

@@ -337,6 +337,10 @@ function substrCount(haystack, needle) {
 // src/SelectBuilder/SelectBuilder.ts
 var isNullish = (v) => v === void 0 || v === null || v === false || Object.is(NaN, v);
 var defaultEngine = "mysql";
+var trailingOperatorRegex = /\s(=|!=|<>|<=|>=|<|>|(?:NOT\s+)?IN|(?:NOT\s+)?I?LIKE(?:\s+%?\??%?)?|(?:NOT\s+)?BETWEEN)$/i;
+function isStandaloneExpression(column) {
+  return /\s/.test(column) && !trailingOperatorRegex.test(column);
+}
 var SelectBuilder = class _SelectBuilder {
   /**
    * The list of values to bind to the query
@@ -406,9 +410,10 @@ var SelectBuilder = class _SelectBuilder {
    */
   constructor(sql, bindings = {}) {
     if (sql) {
-      if (bindings) {
-        const keys = Object.keys(bindings);
-        const regexp = new RegExp(`:(${keys.join("|")})`, "g");
+      const keys = bindings ? Object.keys(bindings) : [];
+      if (keys.length > 0) {
+        const names = keys.sort((a, b) => b.length - a.length).map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+        const regexp = new RegExp(`(?<!:):(${names})\\b`, "g");
         sql = sql.replace(regexp, ($0, $1) => {
           this._bindings.push(bindings[$1]);
           return `__BOUND_${this._bindings.length - 1}__`;
@@ -846,6 +851,8 @@ UNION
    *   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)
+   *   this._conditions(this._wheres, ['price', 'IN', []]); // (condition omitted)
+   *   this._conditions(this._wheres, ['price', 'NOT IN', []]); // (condition omitted)
    */
   _conditions(collection, criteria) {
     const numArgs = criteria.length;
@@ -859,7 +866,7 @@ UNION
     if (numArgs === 1) {
       collection.push(column);
       return this;
-    } else if (numArgs === 2 && Array.isArray(operator) && substrCount(column, "?") === operator.length) {
+    } else if (numArgs === 2 && Array.isArray(operator) && substrCount(column, "?") === operator.length && (operator.length > 0 || isStandaloneExpression(column))) {
       const values = operator;
       const sql = column.replace(/\?/g, () => {
         this._bindings.push(values.shift());
@@ -907,6 +914,9 @@ UNION
         operator === "=" ? `${column} IS NULL` : `${column} IS NOT NULL`
       );
     } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        return this;
+      }
       const inVals = [];
       for (let i = 0; i < value.length; i++) {
         inVals.push(`__BOUND_${this._bindings.length}__`);
@@ -978,7 +988,9 @@ UNION
       for (const [key, value] of Object.entries(conditions)) {
         const one = [];
         this._conditions(one, [key, value]);
-        items.push(one[0]);
+        if (one.length > 0) {
+          items.push(one[0]);
+        }
       }
     }
     const joined = items.join(" OR ");
@@ -994,7 +1006,9 @@ UNION
    */
   orWhere(conditions) {
     const joined = this._orConditions(conditions);
-    this.where(`(${joined})`);
+    if (joined !== "") {
+      this.where(`(${joined})`);
+    }
     return this;
   }
   /**
@@ -1003,7 +1017,9 @@ UNION
    */
   orHaving(conditions) {
     const joined = this._orConditions(conditions);
-    this.having(`(${joined})`);
+    if (joined !== "") {
+      this.having(`(${joined})`);
+    }
     return this;
   }
   /**

package/dist/index.d.ts

@@ -14,10 +14,6 @@ export type WhereCriteria = [
 ] | [
 	Record<string, any>
 ];
-/**
- * Build a select query
- * Class Select
- */
 export declare class SelectBuilder {
 	/**
 	 * The list of values to bind to the query
@@ -306,6 +302,8 @@ export declare class SelectBuilder {
 	 *   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)
+	 *   this._conditions(this._wheres, ['price', 'IN', []]); // (condition omitted)
+	 *   this._conditions(this._wheres, ['price', 'NOT IN', []]); // (condition omitted)
 	 */
 	_conditions(collection: string[], criteria: WhereCriteria): this;
 	/**

package/dist/index.mjs

@@ -297,6 +297,10 @@ function substrCount(haystack, needle) {
 // src/SelectBuilder/SelectBuilder.ts
 var isNullish = (v) => v === void 0 || v === null || v === false || Object.is(NaN, v);
 var defaultEngine = "mysql";
+var trailingOperatorRegex = /\s(=|!=|<>|<=|>=|<|>|(?:NOT\s+)?IN|(?:NOT\s+)?I?LIKE(?:\s+%?\??%?)?|(?:NOT\s+)?BETWEEN)$/i;
+function isStandaloneExpression(column) {
+  return /\s/.test(column) && !trailingOperatorRegex.test(column);
+}
 var SelectBuilder = class _SelectBuilder {
   /**
    * The list of values to bind to the query
@@ -366,9 +370,10 @@ var SelectBuilder = class _SelectBuilder {
    */
   constructor(sql, bindings = {}) {
     if (sql) {
-      if (bindings) {
-        const keys = Object.keys(bindings);
-        const regexp = new RegExp(`:(${keys.join("|")})`, "g");
+      const keys = bindings ? Object.keys(bindings) : [];
+      if (keys.length > 0) {
+        const names = keys.sort((a, b) => b.length - a.length).map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+        const regexp = new RegExp(`(?<!:):(${names})\\b`, "g");
         sql = sql.replace(regexp, ($0, $1) => {
           this._bindings.push(bindings[$1]);
           return `__BOUND_${this._bindings.length - 1}__`;
@@ -806,6 +811,8 @@ UNION
    *   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)
+   *   this._conditions(this._wheres, ['price', 'IN', []]); // (condition omitted)
+   *   this._conditions(this._wheres, ['price', 'NOT IN', []]); // (condition omitted)
    */
   _conditions(collection, criteria) {
     const numArgs = criteria.length;
@@ -819,7 +826,7 @@ UNION
     if (numArgs === 1) {
       collection.push(column);
       return this;
-    } else if (numArgs === 2 && Array.isArray(operator) && substrCount(column, "?") === operator.length) {
+    } else if (numArgs === 2 && Array.isArray(operator) && substrCount(column, "?") === operator.length && (operator.length > 0 || isStandaloneExpression(column))) {
       const values = operator;
       const sql = column.replace(/\?/g, () => {
         this._bindings.push(values.shift());
@@ -867,6 +874,9 @@ UNION
         operator === "=" ? `${column} IS NULL` : `${column} IS NOT NULL`
       );
     } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        return this;
+      }
       const inVals = [];
       for (let i = 0; i < value.length; i++) {
         inVals.push(`__BOUND_${this._bindings.length}__`);
@@ -938,7 +948,9 @@ UNION
       for (const [key, value] of Object.entries(conditions)) {
         const one = [];
         this._conditions(one, [key, value]);
-        items.push(one[0]);
+        if (one.length > 0) {
+          items.push(one[0]);
+        }
       }
     }
     const joined = items.join(" OR ");
@@ -954,7 +966,9 @@ UNION
    */
   orWhere(conditions) {
     const joined = this._orConditions(conditions);
-    this.where(`(${joined})`);
+    if (joined !== "") {
+      this.where(`(${joined})`);
+    }
     return this;
   }
   /**
@@ -963,7 +977,9 @@ UNION
    */
   orHaving(conditions) {
     const joined = this._orConditions(conditions);
-    this.having(`(${joined})`);
+    if (joined !== "") {
+      this.having(`(${joined})`);
+    }
     return this;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sql-love",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "Build SQL queries with JavaScript",
   "type": "module",
   "engines": {
@@ -55,7 +55,7 @@
     "@types/bun": "latest",
     "@types/node": "latest",
     "dts-bundle-generator": "9.5.1",
-    "prettier": "3.9.9",
+    "prettier": "3.9.10",
     "prettier-plugin-organize-imports": "4.3.0",
     "typescript": "5.9.3"
   }