workers-qb 1.7.0 → 1.8.0

package/README.md

@@ -19,12 +19,13 @@ Currently, 3 databases are supported:
 
 ## Features
 
-- [x] Zero dependencies.
+- [x] Zero dependencies
 - [x] Fully typed/TypeScript support
+- [x] [Migrations](https://workers-qb.massadas.com/migrations/)
 - [x] [Type Checks for data read](https://workers-qb.massadas.com/type-check/)
 - [x] [Create/drop tables](https://workers-qb.massadas.com/basic-queries/#dropping-and-creating-tables)
 - [x] [Insert/Bulk Inserts/Update/Select/Delete/Join queries](https://workers-qb.massadas.com/basic-queries/)
-- [x] [Modular selects](https://workers-qb.massadas.com/modular-selects/)
+- [x] [Modular selects](https://workers-qb.massadas.com/modular-selects/) (qb.select(...).where(...).where(...).one())
 - [x] [On Conflict for Inserts and Updates](https://workers-qb.massadas.com/advanced-queries/onConflict/)
 - [x] [Upsert](https://workers-qb.massadas.com/advanced-queries/upsert/)
 
@@ -40,7 +41,7 @@ npm install workers-qb --save
 import { D1QB } from 'workers-qb'
 
 export interface Env {
-  DB: any
+  DB: D1Database
 }
 
 export default {
@@ -65,7 +66,7 @@ export default {
       .execute()
 
     // Or in a modular approach
-    const employeeList = await qb.select<Employee>('employees').where('active = ?', true).execute()
+    const employeeListModular = await qb.select<Employee>('employees').where('active = ?', true).execute()
 
     // You get IDE type hints on each employee data, like:
     // employeeList.results[0].name
@@ -77,6 +78,26 @@ export default {
 }
 ```
 
+## Example for Cloudflare Durable Objects
+
+```ts
+import { DOQB } from 'workers-qb'
+
+export class DOSRS extends DurableObject {
+  getEmployees() {
+    const qb = new DOQB(this.ctx.storage.sql)
+
+    const fetched = qb
+      .fetchAll({
+        tableName: 'employees',
+      })
+      .execute()
+
+    return fetched.results
+  }
+}
+```
+
 ## Example for Cloudflare Workers with PostgreSQL
 
 Remember to close the connection using `ctx.waitUntil(qb.close());` or `await qb.close();` at the end of your request.

package/dist/index.d.mts

@@ -192,6 +192,7 @@ declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnO
     tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;

package/dist/index.d.ts

@@ -192,6 +192,7 @@ declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnO
     tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
     having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;

package/dist/index.js

@@ -160,6 +160,52 @@ var SelectBuilder = class _SelectBuilder {
       this._fetchOne
     );
   }
+  whereIn(fields, values) {
+    let whereInCondition;
+    let whereInParams;
+    const seperateWithComma = (prev, next) => prev + ", " + next;
+    if (values.length === 0) {
+      return new _SelectBuilder(
+        {
+          ...this._options
+        },
+        this._fetchAll,
+        this._fetchOne
+      );
+    }
+    if (!Array.isArray(fields)) {
+      whereInCondition = `(${fields}) IN (VALUES `;
+      whereInCondition += values.map(() => "(?)").reduce(seperateWithComma);
+      whereInCondition += ")";
+      whereInParams = values;
+    } else {
+      const fieldLength = fields.length;
+      whereInCondition = `(${fields.map((val) => val).reduce(seperateWithComma)}) IN (VALUES `;
+      const valuesString = `(${[...new Array(fieldLength).keys()].map(() => "?").reduce(seperateWithComma)})`;
+      whereInCondition += [...new Array(fieldLength).keys()].map(() => valuesString).reduce(seperateWithComma);
+      whereInCondition += ")";
+      whereInParams = values.flat();
+    }
+    let conditions = [whereInCondition];
+    let params = whereInParams;
+    if (this._options.where?.conditions) {
+      conditions = this._options.where?.conditions.concat(conditions);
+    }
+    if (this._options.where?.params) {
+      params = this._options.where?.params.concat(params);
+    }
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        where: {
+          conditions,
+          params
+        }
+      },
+      this._fetchAll,
+      this._fetchOne
+    );
+  }
   join(join) {
     return this._parseArray("join", this._options.join, join);
   }

package/dist/index.mjs

@@ -118,6 +118,52 @@ var SelectBuilder = class _SelectBuilder {
       this._fetchOne
     );
   }
+  whereIn(fields, values) {
+    let whereInCondition;
+    let whereInParams;
+    const seperateWithComma = (prev, next) => prev + ", " + next;
+    if (values.length === 0) {
+      return new _SelectBuilder(
+        {
+          ...this._options
+        },
+        this._fetchAll,
+        this._fetchOne
+      );
+    }
+    if (!Array.isArray(fields)) {
+      whereInCondition = `(${fields}) IN (VALUES `;
+      whereInCondition += values.map(() => "(?)").reduce(seperateWithComma);
+      whereInCondition += ")";
+      whereInParams = values;
+    } else {
+      const fieldLength = fields.length;
+      whereInCondition = `(${fields.map((val) => val).reduce(seperateWithComma)}) IN (VALUES `;
+      const valuesString = `(${[...new Array(fieldLength).keys()].map(() => "?").reduce(seperateWithComma)})`;
+      whereInCondition += [...new Array(fieldLength).keys()].map(() => valuesString).reduce(seperateWithComma);
+      whereInCondition += ")";
+      whereInParams = values.flat();
+    }
+    let conditions = [whereInCondition];
+    let params = whereInParams;
+    if (this._options.where?.conditions) {
+      conditions = this._options.where?.conditions.concat(conditions);
+    }
+    if (this._options.where?.params) {
+      params = this._options.where?.params.concat(params);
+    }
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        where: {
+          conditions,
+          params
+        }
+      },
+      this._fetchAll,
+      this._fetchOne
+    );
+  }
   join(join) {
     return this._parseArray("join", this._options.join, join);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-qb",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -14,7 +14,7 @@
     "build": "tsup src/index.ts --format cjs,esm --dts",
     "lint": "npx @biomejs/biome check src/ tests/ || (npx @biomejs/biome check --write src/ tests/; exit 1)",
     "test": "vitest run --root tests",
-    "prepare": "husky install"
+    "prepare": "husky"
   },
   "publishConfig": {
     "access": "public"
@@ -62,7 +62,7 @@
     "husky": "^9.1.6",
     "tsup": "^8.3.5",
     "typescript": "^5.6.3",
-    "vitest": "2.0.5",
+    "vitest": "2.1.8",
     "wrangler": "^3.86.0"
   }
 }