workers-qb 1.3.1 → 1.4.1

package/README.md

@@ -64,6 +64,9 @@ export default {
       })
       .execute()
 
+    // Or in a modular approach
+    const employeeList = await qb.select<Employee>('employees').where('active = ?', true).execute()
+
     // You get IDE type hints on each employee data, like:
     // employeeList.results[0].name
 

package/dist/index.d.mts

@@ -52,7 +52,7 @@ type DefaultObject = Record<string, Primitive>;
 type DefaultReturnObject = Record<string, null | string | number | boolean | bigint>;
 type Where = {
     conditions: string | Array<string>;
-    params?: Primitive[];
+    params?: Primitive | Primitive[];
 } | string | Array<string>;
 type Join = {
     type?: string | JoinTypes;
@@ -66,7 +66,7 @@ type SelectOne = {
     where?: Where;
     join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
-    having?: string;
+    having?: string | Array<string>;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
     offset?: number;
 };
@@ -156,6 +156,26 @@ type OneResult<ResultWrapper, Result> = Merge<ResultWrapper, {
     results?: Result;
 }>;
 
+declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject> {
+    _debugger: boolean;
+    private _options;
+    private _queryBuilder;
+    constructor(options: Partial<SelectAll>, queryBuilder: (params: SelectAll) => Query);
+    setDebugger(state: boolean): void;
+    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult>;
+    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    private _parseArray;
+    getQuery(): Query<ArrayResult<GenericResultWrapper, GenericResult>>;
+    execute(): Promise<ArrayResult<GenericResultWrapper, GenericResult>>;
+}
+
 declare class QueryBuilder<GenericResultWrapper> {
     _debugger: boolean;
     setDebugger(state: boolean): void;
@@ -170,6 +190,7 @@ declare class QueryBuilder<GenericResultWrapper> {
         tableName: string;
         ifExists?: boolean;
     }): Query<ArrayResult<GenericResultWrapper, GenericResult>>;
+    select<GenericResult = DefaultReturnObject>(tableName: string): SelectBuilder<GenericResultWrapper, GenericResult>;
     fetchOne<GenericResult = DefaultReturnObject>(params: SelectOne): Query<OneResult<GenericResultWrapper, GenericResult>>;
     fetchAll<GenericResult = DefaultReturnObject>(params: SelectAll): Query<ArrayResult<GenericResultWrapper, GenericResult>>;
     raw<GenericResult = DefaultReturnObject>(params: RawQueryFetchOne): Query<OneResult<GenericResultWrapper, GenericResult>>;
@@ -192,7 +213,7 @@ declare class QueryBuilder<GenericResultWrapper> {
     _where(value?: Where): string;
     _join(value?: Join | Array<Join>): string;
     _groupBy(value?: string | Array<string>): string;
-    _having(value?: string): string;
+    _having(value?: string | Array<string>): string;
     _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;
     _limit(value?: number): string;
     _offset(value?: number): string;

package/dist/index.d.ts

@@ -52,7 +52,7 @@ type DefaultObject = Record<string, Primitive>;
 type DefaultReturnObject = Record<string, null | string | number | boolean | bigint>;
 type Where = {
     conditions: string | Array<string>;
-    params?: Primitive[];
+    params?: Primitive | Primitive[];
 } | string | Array<string>;
 type Join = {
     type?: string | JoinTypes;
@@ -66,7 +66,7 @@ type SelectOne = {
     where?: Where;
     join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
-    having?: string;
+    having?: string | Array<string>;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
     offset?: number;
 };
@@ -156,6 +156,26 @@ type OneResult<ResultWrapper, Result> = Merge<ResultWrapper, {
     results?: Result;
 }>;
 
+declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject> {
+    _debugger: boolean;
+    private _options;
+    private _queryBuilder;
+    constructor(options: Partial<SelectAll>, queryBuilder: (params: SelectAll) => Query);
+    setDebugger(state: boolean): void;
+    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult>;
+    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult>;
+    private _parseArray;
+    getQuery(): Query<ArrayResult<GenericResultWrapper, GenericResult>>;
+    execute(): Promise<ArrayResult<GenericResultWrapper, GenericResult>>;
+}
+
 declare class QueryBuilder<GenericResultWrapper> {
     _debugger: boolean;
     setDebugger(state: boolean): void;
@@ -170,6 +190,7 @@ declare class QueryBuilder<GenericResultWrapper> {
         tableName: string;
         ifExists?: boolean;
     }): Query<ArrayResult<GenericResultWrapper, GenericResult>>;
+    select<GenericResult = DefaultReturnObject>(tableName: string): SelectBuilder<GenericResultWrapper, GenericResult>;
     fetchOne<GenericResult = DefaultReturnObject>(params: SelectOne): Query<OneResult<GenericResultWrapper, GenericResult>>;
     fetchAll<GenericResult = DefaultReturnObject>(params: SelectAll): Query<ArrayResult<GenericResultWrapper, GenericResult>>;
     raw<GenericResult = DefaultReturnObject>(params: RawQueryFetchOne): Query<OneResult<GenericResultWrapper, GenericResult>>;
@@ -192,7 +213,7 @@ declare class QueryBuilder<GenericResultWrapper> {
     _where(value?: Where): string;
     _join(value?: Join | Array<Join>): string;
     _groupBy(value?: string | Array<string>): string;
-    _having(value?: string): string;
+    _having(value?: string | Array<string>): string;
     _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;
     _limit(value?: number): string;
     _offset(value?: number): string;

package/dist/index.js

@@ -82,7 +82,112 @@ var Query = class {
   }
 };
 
-// src/Builder.ts
+// src/modularBuilder.ts
+var SelectBuilder = class _SelectBuilder {
+  _debugger = false;
+  _options = {};
+  _queryBuilder;
+  constructor(options, queryBuilder) {
+    this._options = options;
+    this._queryBuilder = queryBuilder;
+  }
+  setDebugger(state) {
+    this._debugger = state;
+  }
+  tableName(tableName) {
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        tableName
+      },
+      this._queryBuilder
+    );
+  }
+  fields(fields) {
+    return this._parseArray("fields", this._options.fields, fields);
+  }
+  where(conditions, params) {
+    if (!Array.isArray(conditions)) {
+      conditions = [conditions];
+    }
+    if (params === void 0) params = [];
+    if (!Array.isArray(params)) {
+      params = [params];
+    }
+    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._queryBuilder
+    );
+  }
+  join(join) {
+    return this._parseArray("join", this._options.join, join);
+  }
+  groupBy(groupBy) {
+    return this._parseArray("groupBy", this._options.groupBy, groupBy);
+  }
+  having(having) {
+    return this._parseArray("having", this._options.having, having);
+  }
+  orderBy(orderBy) {
+    return this._parseArray("orderBy", this._options.orderBy, orderBy);
+  }
+  offset(offset) {
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        offset
+      },
+      this._queryBuilder
+    );
+  }
+  limit(limit) {
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        limit
+      },
+      this._queryBuilder
+    );
+  }
+  _parseArray(fieldName, option, value) {
+    let val = [];
+    if (!Array.isArray(value)) {
+      val.push(value);
+    } else {
+      val = value;
+    }
+    if (option && Array.isArray(option)) {
+      val = [...option, ...val];
+    }
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        [fieldName]: val
+      },
+      this._queryBuilder
+    );
+  }
+  getQuery() {
+    return this._queryBuilder(this._options);
+  }
+  async execute() {
+    return this._queryBuilder(this._options).execute();
+  }
+};
+
+// src/builder.ts
 var QueryBuilder = class {
   _debugger = false;
   setDebugger(state) {
@@ -108,13 +213,23 @@ var QueryBuilder = class {
       return this.execute(q);
     }, `DROP TABLE ${params.ifExists ? "IF EXISTS" : ""} ${params.tableName}`);
   }
+  select(tableName) {
+    return new SelectBuilder(
+      {
+        tableName
+      },
+      (params) => {
+        return this.fetchAll(params);
+      }
+    );
+  }
   fetchOne(params) {
     return new Query(
       (q) => {
         return this.execute(q);
       },
       this._select({ ...params, limit: 1 }),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? params.where?.params : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ONE" /* ONE */
     );
   }
@@ -124,7 +239,7 @@ var QueryBuilder = class {
         return this.execute(q);
       },
       this._select(params),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? params.where?.params : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ALL" /* ALL */
     );
   }
@@ -168,7 +283,11 @@ var QueryBuilder = class {
   update(params) {
     let args = this._parse_arguments(params.data);
     if (typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params) {
-      args = (params.where?.params).concat(args);
+      if (Array.isArray(params.where?.params)) {
+        args = params.where?.params.concat(args);
+      } else {
+        args = [params.where?.params].concat(args);
+      }
     }
     return new Query(
       (q) => {
@@ -185,7 +304,7 @@ var QueryBuilder = class {
         return this.execute(q);
       },
       this._delete(params),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? params.where?.params : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ALL" /* ALL */
     );
   }
@@ -228,7 +347,11 @@ var QueryBuilder = class {
     if (params.onConflict && typeof params.onConflict === "object") {
       onConflict = this._onConflict(params.onConflict);
       if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params) {
-        index += (params.onConflict.where?.params).length;
+        if (Array.isArray(params.onConflict.where?.params)) {
+          index += (params.onConflict.where?.params).length;
+        } else {
+          index += 1;
+        }
       }
       if (params.onConflict.data) {
         index += this._parse_arguments(params.onConflict.data).length;
@@ -251,7 +374,7 @@ var QueryBuilder = class {
     return `INSERT ${orConflict} INTO ${params.tableName} (${columns}) VALUES ${rows.join(", ")}` + onConflict + this._returning(params.returning);
   }
   _update(params) {
-    const whereParamsLength = typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Object.keys(params.where?.params).length : 0;
+    const whereParamsLength = typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? Object.keys(params.where?.params).length : 1 : 0;
     const set = [];
     let index = 1;
     for (const [key, value] of Object.entries(params.data)) {
@@ -311,19 +434,32 @@ var QueryBuilder = class {
   }
   _having(value) {
     if (!value) return "";
-    return ` HAVING ${value}`;
+    if (typeof value === "string") return ` HAVING ${value}`;
+    return ` HAVING ${value.join(" AND ")}`;
   }
   _orderBy(value) {
     if (!value) return "";
     if (typeof value === "string") return ` ORDER BY ${value}`;
+    const order = [];
     if (Array.isArray(value)) {
-      return ` ORDER BY ${value.join(", ")}`;
+      for (const val of value) {
+        order.push(val);
+      }
+    } else {
+      order.push(value);
     }
-    const order = [];
-    Object.entries(value).forEach(([key, item]) => {
-      order.push(`${key} ${item}`);
+    const result = order.map((obj) => {
+      if (typeof obj === "object") {
+        const objs = [];
+        Object.entries(obj).forEach(([key, item]) => {
+          objs.push(`${key} ${item}`);
+        });
+        return objs.join(", ");
+      } else {
+        return obj;
+      }
     });
-    return ` ORDER BY ${order.join(", ")}`;
+    return ` ORDER BY ${result.join(", ")}`;
   }
   _limit(value) {
     if (!value) return "";

package/dist/index.mjs

@@ -48,7 +48,112 @@ var Query = class {
   }
 };
 
-// src/Builder.ts
+// src/modularBuilder.ts
+var SelectBuilder = class _SelectBuilder {
+  _debugger = false;
+  _options = {};
+  _queryBuilder;
+  constructor(options, queryBuilder) {
+    this._options = options;
+    this._queryBuilder = queryBuilder;
+  }
+  setDebugger(state) {
+    this._debugger = state;
+  }
+  tableName(tableName) {
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        tableName
+      },
+      this._queryBuilder
+    );
+  }
+  fields(fields) {
+    return this._parseArray("fields", this._options.fields, fields);
+  }
+  where(conditions, params) {
+    if (!Array.isArray(conditions)) {
+      conditions = [conditions];
+    }
+    if (params === void 0) params = [];
+    if (!Array.isArray(params)) {
+      params = [params];
+    }
+    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._queryBuilder
+    );
+  }
+  join(join) {
+    return this._parseArray("join", this._options.join, join);
+  }
+  groupBy(groupBy) {
+    return this._parseArray("groupBy", this._options.groupBy, groupBy);
+  }
+  having(having) {
+    return this._parseArray("having", this._options.having, having);
+  }
+  orderBy(orderBy) {
+    return this._parseArray("orderBy", this._options.orderBy, orderBy);
+  }
+  offset(offset) {
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        offset
+      },
+      this._queryBuilder
+    );
+  }
+  limit(limit) {
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        limit
+      },
+      this._queryBuilder
+    );
+  }
+  _parseArray(fieldName, option, value) {
+    let val = [];
+    if (!Array.isArray(value)) {
+      val.push(value);
+    } else {
+      val = value;
+    }
+    if (option && Array.isArray(option)) {
+      val = [...option, ...val];
+    }
+    return new _SelectBuilder(
+      {
+        ...this._options,
+        [fieldName]: val
+      },
+      this._queryBuilder
+    );
+  }
+  getQuery() {
+    return this._queryBuilder(this._options);
+  }
+  async execute() {
+    return this._queryBuilder(this._options).execute();
+  }
+};
+
+// src/builder.ts
 var QueryBuilder = class {
   _debugger = false;
   setDebugger(state) {
@@ -74,13 +179,23 @@ var QueryBuilder = class {
       return this.execute(q);
     }, `DROP TABLE ${params.ifExists ? "IF EXISTS" : ""} ${params.tableName}`);
   }
+  select(tableName) {
+    return new SelectBuilder(
+      {
+        tableName
+      },
+      (params) => {
+        return this.fetchAll(params);
+      }
+    );
+  }
   fetchOne(params) {
     return new Query(
       (q) => {
         return this.execute(q);
       },
       this._select({ ...params, limit: 1 }),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? params.where?.params : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ONE" /* ONE */
     );
   }
@@ -90,7 +205,7 @@ var QueryBuilder = class {
         return this.execute(q);
       },
       this._select(params),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? params.where?.params : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ALL" /* ALL */
     );
   }
@@ -134,7 +249,11 @@ var QueryBuilder = class {
   update(params) {
     let args = this._parse_arguments(params.data);
     if (typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params) {
-      args = (params.where?.params).concat(args);
+      if (Array.isArray(params.where?.params)) {
+        args = params.where?.params.concat(args);
+      } else {
+        args = [params.where?.params].concat(args);
+      }
     }
     return new Query(
       (q) => {
@@ -151,7 +270,7 @@ var QueryBuilder = class {
         return this.execute(q);
       },
       this._delete(params),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? params.where?.params : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ALL" /* ALL */
     );
   }
@@ -194,7 +313,11 @@ var QueryBuilder = class {
     if (params.onConflict && typeof params.onConflict === "object") {
       onConflict = this._onConflict(params.onConflict);
       if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params) {
-        index += (params.onConflict.where?.params).length;
+        if (Array.isArray(params.onConflict.where?.params)) {
+          index += (params.onConflict.where?.params).length;
+        } else {
+          index += 1;
+        }
       }
       if (params.onConflict.data) {
         index += this._parse_arguments(params.onConflict.data).length;
@@ -217,7 +340,7 @@ var QueryBuilder = class {
     return `INSERT ${orConflict} INTO ${params.tableName} (${columns}) VALUES ${rows.join(", ")}` + onConflict + this._returning(params.returning);
   }
   _update(params) {
-    const whereParamsLength = typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Object.keys(params.where?.params).length : 0;
+    const whereParamsLength = typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? Object.keys(params.where?.params).length : 1 : 0;
     const set = [];
     let index = 1;
     for (const [key, value] of Object.entries(params.data)) {
@@ -277,19 +400,32 @@ var QueryBuilder = class {
   }
   _having(value) {
     if (!value) return "";
-    return ` HAVING ${value}`;
+    if (typeof value === "string") return ` HAVING ${value}`;
+    return ` HAVING ${value.join(" AND ")}`;
   }
   _orderBy(value) {
     if (!value) return "";
     if (typeof value === "string") return ` ORDER BY ${value}`;
+    const order = [];
     if (Array.isArray(value)) {
-      return ` ORDER BY ${value.join(", ")}`;
+      for (const val of value) {
+        order.push(val);
+      }
+    } else {
+      order.push(value);
     }
-    const order = [];
-    Object.entries(value).forEach(([key, item]) => {
-      order.push(`${key} ${item}`);
+    const result = order.map((obj) => {
+      if (typeof obj === "object") {
+        const objs = [];
+        Object.entries(obj).forEach(([key, item]) => {
+          objs.push(`${key} ${item}`);
+        });
+        return objs.join(", ");
+      } else {
+        return obj;
+      }
     });
-    return ` ORDER BY ${order.join(", ")}`;
+    return ` ORDER BY ${result.join(", ")}`;
   }
   _limit(value) {
     if (!value) return "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-qb",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",