bun-query-builder 0.1.32 → 0.1.34

package/dist/bin/cli.js

@@ -11664,8 +11664,9 @@ async function getConfig() {
       alias: "qb",
       defaultConfig: defaultConfig4
     });
+    setConfig(_config);
   }
-  return _config;
+  return config5;
 }
 function setConfig(userConfig) {
   if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
@@ -12835,7 +12836,7 @@ function createQueryBuilder(state) {
     };
     const addWhereText = (prefix, clause) => {
       const hasWhere = SQL_PATTERNS.WHERE.test(text);
-      const p = hasWhere ? prefix : "WHERE";
+      const p = !hasWhere ? "WHERE" : prefix === "WHERE" ? "AND" : prefix;
       text = `${text} ${p} ${clause}`;
     };
     const appendSetOp = (op, other) => {
@@ -13993,87 +13994,71 @@ function createQueryBuilder(state) {
         return this;
       },
       whereLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} WHERE ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("WHERE", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} WHERE ${sql(String(column))} ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("WHERE", `${String(column)} ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} WHERE ${expr}`;
+        else
           addWhereText("WHERE", `LOWER(${String(column)}) LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} OR ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("OR", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} OR ${sql(String(column))} ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("OR", `${String(column)} ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} OR ${expr}`;
+        else
           addWhereText("OR", `LOWER(${String(column)}) LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereNotLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} NOT LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} WHERE ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("WHERE", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} NOT LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereNotILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} WHERE ${sql(String(column))} NOT ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("WHERE", `${String(column)} NOT ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} WHERE ${expr}`;
+        else
           addWhereText("WHERE", `LOWER(${String(column)}) NOT LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereNotLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} NOT LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} OR ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("OR", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} NOT LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereNotILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} OR ${sql(String(column))} NOT ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("OR", `${String(column)} NOT ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} OR ${expr}`;
+        else
           addWhereText("OR", `LOWER(${String(column)}) NOT LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereAny(cols, op, value) {
@@ -14673,19 +14658,21 @@ function createQueryBuilder(state) {
           q = sql`${q} ORDER BY ${sql(String(column))} ${direction === "asc" ? sql`ASC` : sql`DESC`} LIMIT ${perPage + 1}`;
         }
         const rows = await runWithHooks(q, "select", { signal: abortSignal, timeoutMs });
-        const next = rows.length > perPage ? Array.isArray(column) ? column.map((c) => rows[perPage]?.[c]) : rows[perPage]?.[column] : null;
+        const hasMore = rows.length > perPage;
         const data = rows.slice(0, perPage);
+        const lastRow = data[data.length - 1];
+        const next = hasMore && lastRow ? Array.isArray(column) ? column.map((c) => lastRow[c]) : lastRow[column] : null;
         const prevCursor = data.length ? Array.isArray(column) ? column.map((c) => data[0]?.[c]) : data[0]?.[column] : null;
         return { data, meta: { perPage, nextCursor: next ?? null, prevCursor } };
       },
       async chunk(size, handler) {
         let page = 1;
         while (true) {
-          const { data } = await this.paginate(size, page);
+          const { data, meta: meta2 } = await this.paginate(size, page);
           if (data.length === 0)
             break;
           await handler(data);
-          if (data.length < size)
+          if (page >= meta2.lastPage)
             break;
           page += 1;
         }
@@ -30125,7 +30112,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.32";
+var version2 = "0.1.34";
 
 // bin/cli.ts
 init_actions();

package/dist/config.d.ts

@@ -10,6 +10,26 @@ export declare function getPlaceholder(index: number): string;
  * MySQL/SQLite: ?, ?, ?
  */
 export declare function getPlaceholders(count: number, startIndex?: number): string;
+/**
+ * Load the query-builder config from a config file (`query-builder.config.ts`,
+ * `.config/query-builder.ts`, etc.) and environment variables via bunfig, then
+ * MERGE it into the live, process-wide `config` singleton so every reader
+ * (dialect dispatch, placeholders, soft-deletes, the model layer, …) sees it.
+ *
+ * Call this once at application boot if you keep configuration in a file:
+ *
+ * ```ts
+ * import { getConfig } from 'bun-query-builder'
+ * await getConfig() // applies query-builder.config.ts + env to the runtime
+ * ```
+ *
+ * It is intentionally explicit/async: the builder otherwise runs purely off the
+ * synchronous `config` singleton (defaults + any `setConfig`), which keeps
+ * `bun --compile` and test behavior deterministic — auto-loading a file in the
+ * background would make early queries race the load. Previously this wrote the
+ * loaded config to a private `_config` variable that nothing else read, so a
+ * config file silently never took effect; it now routes through `setConfig`.
+ */
 export declare function getConfig(): Promise<QueryBuilderConfig>;
 export declare function setConfig(userConfig: Partial<QueryBuilderConfig>): void;
 export declare const defaultConfig: QueryBuilderConfig;

package/dist/src/index.js

@@ -11664,8 +11664,9 @@ async function getConfig() {
       alias: "qb",
       defaultConfig: defaultConfig4
     });
+    setConfig(_config);
   }
-  return _config;
+  return config5;
 }
 function setConfig(userConfig) {
   if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
@@ -12835,7 +12836,7 @@ function createQueryBuilder(state) {
     };
     const addWhereText = (prefix, clause) => {
       const hasWhere = SQL_PATTERNS.WHERE.test(text);
-      const p = hasWhere ? prefix : "WHERE";
+      const p = !hasWhere ? "WHERE" : prefix === "WHERE" ? "AND" : prefix;
       text = `${text} ${p} ${clause}`;
     };
     const appendSetOp = (op, other) => {
@@ -13993,87 +13994,71 @@ function createQueryBuilder(state) {
         return this;
       },
       whereLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} WHERE ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("WHERE", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} WHERE ${sql(String(column))} ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("WHERE", `${String(column)} ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} WHERE ${expr}`;
+        else
           addWhereText("WHERE", `LOWER(${String(column)}) LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} OR ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("OR", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} OR ${sql(String(column))} ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("OR", `${String(column)} ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} OR ${expr}`;
+        else
           addWhereText("OR", `LOWER(${String(column)}) LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereNotLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} NOT LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} WHERE ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("WHERE", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} NOT LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereNotILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} WHERE ${sql(String(column))} NOT ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("WHERE", `${String(column)} NOT ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} WHERE ${expr}`;
+        else
           addWhereText("WHERE", `LOWER(${String(column)}) NOT LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereNotLike(column, pattern, caseSensitive = false) {
-        const expr = caseSensitive ? sql`${sql(String(column))} NOT LIKE ${pattern}` : sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-        built = sql`${ensureBuilt()} OR ${expr}`;
         const ph = getPlaceholder(whereParams.length + 1);
         addWhereText("OR", `${caseSensitive ? String(column) : `LOWER(${String(column)})`} NOT LIKE ${caseSensitive ? ph : `LOWER(${ph})`}`);
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       orWhereNotILike(column, pattern) {
         const ph = getPlaceholder(whereParams.length + 1);
-        if (config5.dialect === "postgres") {
-          built = sql`${ensureBuilt()} OR ${sql(String(column))} NOT ILIKE ${pattern}`;
+        if (config5.dialect === "postgres")
           addWhereText("OR", `${String(column)} NOT ILIKE ${ph}`);
-        } else {
-          const expr = sql`LOWER(${sql(String(column))}) NOT LIKE LOWER(${pattern})`;
-          built = sql`${ensureBuilt()} OR ${expr}`;
+        else
           addWhereText("OR", `LOWER(${String(column)}) NOT LIKE LOWER(${ph})`);
-        }
         whereParams.push(pattern);
+        built = null;
         return this;
       },
       whereAny(cols, op, value) {
@@ -14673,19 +14658,21 @@ function createQueryBuilder(state) {
           q = sql`${q} ORDER BY ${sql(String(column))} ${direction === "asc" ? sql`ASC` : sql`DESC`} LIMIT ${perPage + 1}`;
         }
         const rows = await runWithHooks(q, "select", { signal: abortSignal, timeoutMs });
-        const next = rows.length > perPage ? Array.isArray(column) ? column.map((c) => rows[perPage]?.[c]) : rows[perPage]?.[column] : null;
+        const hasMore = rows.length > perPage;
         const data = rows.slice(0, perPage);
+        const lastRow = data[data.length - 1];
+        const next = hasMore && lastRow ? Array.isArray(column) ? column.map((c) => lastRow[c]) : lastRow[column] : null;
         const prevCursor = data.length ? Array.isArray(column) ? column.map((c) => data[0]?.[c]) : data[0]?.[column] : null;
         return { data, meta: { perPage, nextCursor: next ?? null, prevCursor } };
       },
       async chunk(size, handler) {
         let page = 1;
         while (true) {
-          const { data } = await this.paginate(size, page);
+          const { data, meta: meta2 } = await this.paginate(size, page);
           if (data.length === 0)
             break;
           await handler(data);
-          if (data.length < size)
+          if (page >= meta2.lastPage)
             break;
           page += 1;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",