workers-qb 0.1.12 → 1.0.1

package/README.md

@@ -1,5 +1,7 @@
 # workers-qb
 
+### [Read the documentation here!](https://workers-qb.massadas.com/)
+
 Zero dependencies Query Builder for [Cloudflare Workers](https://developers.cloudflare.com/workers/)
 
 This module provides a simple standardized interface while keeping the benefits and speed of using raw queries over a
@@ -13,20 +15,16 @@ Currently, 2 databases are supported:
 - [Cloudflare D1](https://developers.cloudflare.com/d1/)
 - [PostgreSQL (using node-postgres)](https://developers.cloudflare.com/workers/databases/connect-to-postgres/)
 
-Read the documentation [workers-qb.massadas.com](https://workers-qb.massadas.com/)!
-
 ## Features
 
 - [x] Zero dependencies.
 - [x] Fully typed/TypeScript support
 - [x] SQL Type checking with compatible IDE's
-- [x] Insert/Update/Select/Delete/Join queries
-- [x] On Conflict for Inserts and Updates
 - [x] Create/drop tables
-- [x] Keep where conditions simple in code
-- [x] Bulk insert
-- [x] Workers D1 Support
-- [x] Workers PostgreSQL Support
+- [x] [Insert/Bulk Inserts/Update/Select/Delete/Join queries](https://workers-qb.massadas.com/basic-queries/)
+- [x] [On Conflict for Inserts and Updates](https://workers-qb.massadas.com/advanced-queries/onConflict/)
+- [x] [Support for Cloudflare Workers D1](https://workers-qb.massadas.com/databases/cloudflare-d1/)
+- [x] [Support for Cloudflare Workers PostgreSQL (using node-postgres)](https://workers-qb.massadas.com/databases/postgresql/)
 - [ ] Named parameters (waiting for full support in D1)
 
 ## Installation
@@ -35,7 +33,7 @@ Read the documentation [workers-qb.massadas.com](https://workers-qb.massadas.com
 npm install workers-qb --save
 ```
 
-## Example Cloudflare D1 Usage
+## Example for Cloudflare Workers D1
 
 ```ts
 import { D1QB } from 'workers-qb'
@@ -48,14 +46,16 @@ export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
     const qb = new D1QB(env.DB)
 
-    const fetched = await qb.fetchOne({
-      tableName: 'employees',
-      fields: 'count(*) as count',
-      where: {
-        conditions: 'active = ?1',
-        params: [true],
-      },
-    })
+    const fetched = await qb
+      .fetchOne({
+        tableName: 'employees',
+        fields: 'count(*) as count',
+        where: {
+          conditions: 'active = ?1',
+          params: [true],
+        },
+      })
+      .execute()
 
     return Response.json({
       activeEmployees: fetched.results?.count || 0,
@@ -64,7 +64,7 @@ export default {
 }
 ```
 
-## Example Cloudflare Workers with PostgreSQL Usage
+## 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.
 You may also reuse this connection to execute multiple queries, or share it between multiple requests if you are using
@@ -91,14 +91,16 @@ export default {
     const qb = new PGQB(new Client(env.DB_URL))
     await qb.connect()
 
-    const fetched = await qb.fetchOne({
-      tableName: 'employees',
-      fields: 'count(*) as count',
-      where: {
-        conditions: 'active = ?1',
-        params: [true],
-      },
-    })
+    const fetched = await qb
+      .fetchOne({
+        tableName: 'employees',
+        fields: 'count(*) as count',
+        where: {
+          conditions: 'active = ?1',
+          params: [true],
+        },
+      })
+      .execute()
 
     ctx.waitUntil(qb.close())
     return Response.json({
@@ -107,148 +109,3 @@ export default {
   },
 }
 ```
-
-## Basic queries
-
-#### Fetching a single record
-
-```ts
-const qb = new D1QB(env.DB)
-
-const fetched = await qb.fetchOne({
-  tableName: 'employees',
-  fields: 'count(*) as count',
-  where: {
-    conditions: 'department = ?1',
-    params: ['HQ'],
-  },
-})
-
-console.log(`There are ${fetched.results.count} employees in the HR department`)
-```
-
-#### Fetching multiple records
-
-```ts
-import { OrderTypes } from 'workers-qb'
-const qb = new D1QB(env.DB)
-
-const fetched = await qb.fetchAll({
-  tableName: 'employees',
-  fields: ['role', 'count(*) as count'],
-  where: {
-    conditions: 'department = ?1',
-    params: ['HR'],
-  },
-  groupBy: 'role',
-  orderBy: {
-    count: OrderTypes.DESC,
-  },
-})
-
-console.log(`Roles in the HR department:`)
-
-fetched.results.forEach((employee) => {
-  console.log(`${employee.role} has ${employee.count} employees`)
-})
-```
-
-#### Inserting rows
-
-```ts
-import { Raw } from 'workers-qb'
-const qb = new D1QB(env.DB)
-
-const inserted = await qb.insert({
-  tableName: 'employees',
-  data: {
-    name: 'Joe',
-    role: 'manager',
-    department: 'store',
-    created_at: new Raw('CURRENT_TIMESTAMP'),
-  },
-  returning: '*',
-})
-
-console.log(inserted) // This will contain the data after SQL triggers and primary keys that are automated
-```
-
-## Bulk Inserting rows
-
-```ts
-import { Raw } from 'workers-qb'
-const qb = new D1QB(env.DB)
-
-const inserted = await qb.insert({
-  tableName: 'employees',
-  data: [
-    {
-      name: 'Joe',
-      role: 'manager',
-      department: 'store',
-      created_at: new Raw('CURRENT_TIMESTAMP'),
-    },
-    {
-      name: 'John',
-      role: 'employee',
-      department: 'store',
-      created_at: new Raw('CURRENT_TIMESTAMP'),
-    },
-    {
-      name: 'Mickael',
-      role: 'employee',
-      department: 'store',
-      created_at: new Raw('CURRENT_TIMESTAMP'),
-    },
-  ],
-})
-```
-
-#### Updating rows
-
-```ts
-const updated = await qb.update({
-  tableName: 'employees',
-  data: {
-    role: 'CEO',
-    department: 'HQ',
-  },
-  where: {
-    conditions: 'id = ?1',
-    params: [123],
-  },
-})
-
-console.log(`Lines affected in this query: ${updated.changes}`)
-```
-
-#### Deleting rows
-
-```ts
-const deleted = await qb.delete({
-  tableName: 'employees',
-  where: {
-    conditions: 'id = ?1',
-    params: [123],
-  },
-})
-
-console.log(`Lines affected in this query: ${deleted.changes}`)
-```
-
-#### Dropping and creating tables
-
-```ts
-const created = await qb.createTable({
-  tableName: 'testTable',
-  schema: `
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      name TEXT NOT NULL
-    `,
-  ifNotExists: true,
-})
-
-const dropped = await qb.dropTable({
-  tableName: 'testTable',
-})
-```

package/dist/{Builder.d.ts → src/Builder.d.ts}

@@ -1,28 +1,25 @@
 import { Delete, Insert, Join, SelectAll, SelectOne, Update } from './interfaces';
-import { ConflictTypes, FetchTypes, OrderTypes } from './enums';
-import { Raw } from './tools';
+import { ConflictTypes, OrderTypes } from './enums';
+import { Query, Raw } from './tools';
 export declare class QueryBuilder<GenericResult, GenericResultOne> {
     _debugger: boolean;
     setDebugger(state: boolean): void;
-    execute(params: {
-        query: string;
-        arguments?: (string | number | boolean | null | Raw)[];
-        fetchType?: FetchTypes;
-    }): Promise<any>;
+    execute(query: Query): Promise<GenericResultOne | GenericResult>;
+    batchExecute(queryArray: Query[]): Promise<(GenericResultOne | GenericResult)[]>;
     createTable(params: {
         tableName: string;
         schema: string;
         ifNotExists?: boolean;
-    }): Promise<GenericResult>;
+    }): Query;
     dropTable(params: {
         tableName: string;
         ifExists?: boolean;
-    }): Promise<GenericResult>;
-    fetchOne(params: SelectOne): Promise<GenericResultOne>;
-    fetchAll(params: SelectAll): Promise<GenericResult>;
-    insert(params: Insert): Promise<GenericResultOne | GenericResult>;
-    update(params: Update): Promise<GenericResult>;
-    delete(params: Delete): Promise<GenericResult>;
+    }): Query;
+    fetchOne(params: SelectOne): Query;
+    fetchAll(params: SelectAll): Query;
+    insert(params: Insert): Query;
+    update(params: Update): Query;
+    delete(params: Delete): Query;
     _parse_arguments(row: Record<string, string | boolean | number | null | Raw>): Array<any>;
     _onConflict(resolution?: string | ConflictTypes): string;
     _insert(params: Insert): string;

package/dist/src/databases/d1.d.ts

@@ -0,0 +1,9 @@
+import { QueryBuilder } from '../Builder';
+import { Query } from '../tools';
+import { D1Result, D1ResultOne } from '../interfaces';
+export declare class D1QB extends QueryBuilder<D1Result, D1ResultOne> {
+    private db;
+    constructor(db: any);
+    execute(query: Query): Promise<D1ResultOne | D1Result>;
+    batchExecute(queryArray: Query[]): Promise<(D1ResultOne | D1Result)[]>;
+}

package/dist/{databases → src/databases}/pg.d.ts

@@ -1,15 +1,10 @@
 import { QueryBuilder } from '../Builder';
-import { FetchTypes } from '../enums';
-import { Raw } from '../tools';
+import { Query } from '../tools';
 import { PGResult, PGResultOne } from '../interfaces';
 export declare class PGQB extends QueryBuilder<PGResult, PGResultOne> {
     private client;
     constructor(client: any);
     connect(): Promise<void>;
     close(): Promise<void>;
-    execute(params: {
-        query: String;
-        arguments?: (string | number | boolean | null | Raw)[];
-        fetchType?: FetchTypes;
-    }): Promise<any>;
+    execute(query: Query): Promise<PGResultOne | PGResult>;
 }

package/dist/{interfaces.d.ts → src/interfaces.d.ts}

@@ -44,7 +44,7 @@ export interface Delete {
 export interface D1Result {
     changes?: number;
     duration: number;
-    lastRowId?: string | number;
+    last_row_id?: string | number;
     results?: Array<Record<string, string | boolean | number | null>>;
     served_by: string;
     success: boolean;
@@ -52,7 +52,7 @@ export interface D1Result {
 export interface D1ResultOne {
     changes?: number;
     duration: number;
-    lastRowId?: string | number;
+    last_row_id?: string | number;
     results?: Record<string, string | boolean | number | null>;
     served_by: string;
     success: boolean;

package/dist/src/tools.d.ts

@@ -0,0 +1,14 @@
+import { FetchTypes } from 'enums';
+export declare class Raw {
+    isRaw: boolean;
+    content: any;
+    constructor(content: any);
+}
+export declare class Query {
+    executeMethod: (query: Query) => Promise<any>;
+    query: string;
+    arguments?: (string | number | boolean | null | Raw)[];
+    fetchType?: FetchTypes;
+    constructor(executeMethod: (query: Query) => Promise<any>, query: string, args?: (string | number | boolean | null | Raw)[], fetchType?: FetchTypes);
+    execute(): Promise<any>;
+}

package/dist/workers-qb.js

@@ -1 +1 @@
-"use strict";var e,t,r,s;exports.OrderTypes=void 0,(e=exports.OrderTypes||(exports.OrderTypes={})).ASC="ASC",e.DESC="DESC",exports.FetchTypes=void 0,(t=exports.FetchTypes||(exports.FetchTypes={})).ONE="ONE",t.ALL="ALL",exports.ConflictTypes=void 0,(r=exports.ConflictTypes||(exports.ConflictTypes={})).ROLLBACK="ROLLBACK",r.ABORT="ABORT",r.FAIL="FAIL",r.IGNORE="IGNORE",r.REPLACE="REPLACE",exports.JoinTypes=void 0,(s=exports.JoinTypes||(exports.JoinTypes={})).INNER="INNER",s.LEFT="LEFT",s.CROSS="CROSS";class n{isRaw=!0;content;constructor(e){this.content=e}}class o{_debugger=!1;setDebugger(e){this._debugger=e}async execute(e){throw new Error("Execute method not implemented")}async createTable(e){return this.execute({query:`CREATE TABLE ${e.ifNotExists?"IF NOT EXISTS":""} ${e.tableName}\n              (\n                ${e.schema}\n              )`})}async dropTable(e){return this.execute({query:`DROP TABLE ${e.ifExists?"IF EXISTS":""} ${e.tableName}`})}async fetchOne(e){const t=await this.execute({query:this._select({...e,limit:1}),arguments:e.where?e.where.params:void 0,fetchType:exports.FetchTypes.ALL});return{...t,results:t.results.length>0?t.results[0]:null}}async fetchAll(e){return this.execute({query:this._select(e),arguments:e.where?e.where.params:void 0,fetchType:exports.FetchTypes.ALL})}async insert(e){let t=[];if(Array.isArray(e.data))for(const r of e.data)t=t.concat(this._parse_arguments(r));else t=t.concat(this._parse_arguments(e.data));const r=Array.isArray(e.data)?exports.FetchTypes.ALL:exports.FetchTypes.ONE;return this.execute({query:this._insert(e),arguments:t,fetchType:r})}async update(e){let t=this._parse_arguments(e.data);return e.where&&e.where.params&&(t=e.where.params.concat(t)),this.execute({query:this._update(e),arguments:t,fetchType:exports.FetchTypes.ALL})}async delete(e){return this.execute({query:this._delete(e),arguments:e.where?e.where.params:void 0,fetchType:exports.FetchTypes.ALL})}_parse_arguments(e){return Object.values(e).filter((e=>!(e instanceof n)))}_onConflict(e){return e?`OR ${e} `:""}_insert(e){const t=[];Array.isArray(e.data)||(e.data=[e.data]);const r=Object.keys(e.data[0]).join(", ");let s=1;for(const r of e.data){const e=[];Object.values(r).forEach((t=>{t instanceof n?e.push(t.content):(e.push(`?${s}`),s+=1)})),t.push(`(${e.join(", ")})`)}return`INSERT ${this._onConflict(e.onConflict)}INTO ${e.tableName} (${r}) VALUES ${t.join(", ")}`+this._returning(e.returning)}_update(e){const t=e.where&&e.where.params?Object.keys(e.where.params).length:0,r=[];let s=1;for(const[o,i]of Object.entries(e.data))i instanceof n?r.push(`${o} = ${i.content}`):(r.push(`${o} = ?${t+s}`),s+=1);return`UPDATE ${this._onConflict(e.onConflict)}${e.tableName} SET ${r.join(", ")}`+this._where(e.where?.conditions)+this._returning(e.returning)}_delete(e){return`DELETE FROM ${e.tableName}`+this._where(e.where?.conditions)+this._returning(e.returning)}_select(e){return`SELECT ${this._fields(e.fields)} FROM ${e.tableName}`+this._join(e.join)+this._where(e.where?.conditions)+this._groupBy(e.groupBy)+this._having(e.having)+this._orderBy(e.orderBy)+this._limit(e.limit)+this._offset(e.offset)}_fields(e){return"string"==typeof e?e:e.join(", ")}_where(e){return e?"string"==typeof e?` WHERE ${e}`:` WHERE ${e.join(" AND ")}`:""}_join(e){if(!e)return"";Array.isArray(e)||(e=[e]);const t=[];return e.forEach((e=>{const r=e.type?`${e.type} `:"";t.push(`${r}JOIN ${"string"==typeof e.table?e.table:`(${this._select(e.table)})`}${e.alias?` AS ${e.alias}`:""} ON ${e.on}`)}))," "+t.join(" ")}_groupBy(e){return e?"string"==typeof e?` GROUP BY ${e}`:` GROUP BY ${e.join(", ")}`:""}_having(e){return e?` HAVING ${e}`:""}_orderBy(e){if(!e)return"";if("string"==typeof e)return` ORDER BY ${e}`;if(Array.isArray(e))return` ORDER BY ${e.join(", ")}`;const t=[];return Object.entries(e).forEach((([e,r])=>{t.push(`${e} ${r}`)})),` ORDER BY ${t.join(", ")}`}_limit(e){return e?` LIMIT ${e}`:""}_offset(e){return e?` OFFSET ${e}`:""}_returning(e){return e?"string"==typeof e?` RETURNING ${e}`:` RETURNING ${e.join(", ")}`:""}}exports.D1QB=class extends o{db;constructor(e){super(),this.db=e}async execute(e){let t=this.db.prepare(e.query);if(this._debugger&&console.log({"workers-qb":e}),e.arguments&&(t=t.bind(...e.arguments)),e.fetchType===exports.FetchTypes.ONE||e.fetchType===exports.FetchTypes.ALL){const r=await t.all();return{changes:r.meta?.changes,duration:r.meta?.duration,last_row_id:r.meta?.last_row_id,served_by:r.meta?.served_by,success:r.success,results:e.fetchType===exports.FetchTypes.ONE&&r.results.length>0?r.results[0]:r.results}}return t.run()}},exports.PGQB=class extends o{client;constructor(e){super(),this.client=e}async connect(){await this.client.connect()}async close(){await this.client.end()}async execute(e){const t=e.query.replaceAll("?","$");let r;return this._debugger&&console.log({"workers-qb":e}),r=e.arguments?await this.client.query({values:e.arguments,text:t}):await this.client.query({text:t}),e.fetchType===exports.FetchTypes.ONE||e.fetchType===exports.FetchTypes.ALL?{command:r.command,lastRowId:r.oid,rowCount:r.rowCount,results:e.fetchType===exports.FetchTypes.ONE&&r.rows.length>0?r.rows[0]:r.rows}:null}},exports.QueryBuilder=o,exports.Raw=n;
+"use strict";var e,t,r,s;exports.OrderTypes=void 0,(e=exports.OrderTypes||(exports.OrderTypes={})).ASC="ASC",e.DESC="DESC",exports.FetchTypes=void 0,(t=exports.FetchTypes||(exports.FetchTypes={})).ONE="ONE",t.ALL="ALL",exports.ConflictTypes=void 0,(r=exports.ConflictTypes||(exports.ConflictTypes={})).ROLLBACK="ROLLBACK",r.ABORT="ABORT",r.FAIL="FAIL",r.IGNORE="IGNORE",r.REPLACE="REPLACE",exports.JoinTypes=void 0,(s=exports.JoinTypes||(exports.JoinTypes={})).INNER="INNER",s.LEFT="LEFT",s.CROSS="CROSS";class n{isRaw=!0;content;constructor(e){this.content=e}}class o{executeMethod;query;arguments;fetchType;constructor(e,t,r,s){this.executeMethod=e,this.query=t,this.arguments=r,this.fetchType=s}async execute(){return this.executeMethod(this)}}class a{_debugger=!1;setDebugger(e){this._debugger=e}async execute(e){throw new Error("Execute method not implemented")}async batchExecute(e){throw new Error("Batch execute method not implemented")}createTable(e){return new o((e=>this.execute(e)),`CREATE TABLE ${e.ifNotExists?"IF NOT EXISTS":""} ${e.tableName}\n              (\n                ${e.schema}\n              )`)}dropTable(e){return new o((e=>this.execute(e)),`DROP TABLE ${e.ifExists?"IF EXISTS":""} ${e.tableName}`)}fetchOne(e){return new o((e=>this.execute(e)),this._select({...e,limit:1}),e.where?e.where.params:void 0,exports.FetchTypes.ONE)}fetchAll(e){return new o((e=>this.execute(e)),this._select(e),e.where?e.where.params:void 0,exports.FetchTypes.ALL)}insert(e){let t=[];if(Array.isArray(e.data))for(const r of e.data)t=t.concat(this._parse_arguments(r));else t=t.concat(this._parse_arguments(e.data));const r=Array.isArray(e.data)?exports.FetchTypes.ALL:exports.FetchTypes.ONE;return new o((e=>this.execute(e)),this._insert(e),t,r)}update(e){let t=this._parse_arguments(e.data);return e.where&&e.where.params&&(t=e.where.params.concat(t)),new o((e=>this.execute(e)),this._update(e),t,exports.FetchTypes.ALL)}delete(e){return new o((e=>this.execute(e)),this._delete(e),e.where?e.where.params:void 0,exports.FetchTypes.ALL)}_parse_arguments(e){return Object.values(e).filter((e=>!(e instanceof n)))}_onConflict(e){return e?`OR ${e} `:""}_insert(e){const t=[];Array.isArray(e.data)||(e.data=[e.data]);const r=Object.keys(e.data[0]).join(", ");let s=1;for(const r of e.data){const e=[];Object.values(r).forEach((t=>{t instanceof n?e.push(t.content):(e.push(`?${s}`),s+=1)})),t.push(`(${e.join(", ")})`)}return`INSERT ${this._onConflict(e.onConflict)}INTO ${e.tableName} (${r}) VALUES ${t.join(", ")}`+this._returning(e.returning)}_update(e){const t=e.where&&e.where.params?Object.keys(e.where.params).length:0,r=[];let s=1;for(const[o,a]of Object.entries(e.data))a instanceof n?r.push(`${o} = ${a.content}`):(r.push(`${o} = ?${t+s}`),s+=1);return`UPDATE ${this._onConflict(e.onConflict)}${e.tableName} SET ${r.join(", ")}`+this._where(e.where?.conditions)+this._returning(e.returning)}_delete(e){return`DELETE FROM ${e.tableName}`+this._where(e.where?.conditions)+this._returning(e.returning)}_select(e){return`SELECT ${this._fields(e.fields)} FROM ${e.tableName}`+this._join(e.join)+this._where(e.where?.conditions)+this._groupBy(e.groupBy)+this._having(e.having)+this._orderBy(e.orderBy)+this._limit(e.limit)+this._offset(e.offset)}_fields(e){return"string"==typeof e?e:e.join(", ")}_where(e){return e?"string"==typeof e?` WHERE ${e}`:` WHERE ${e.join(" AND ")}`:""}_join(e){if(!e)return"";Array.isArray(e)||(e=[e]);const t=[];return e.forEach((e=>{const r=e.type?`${e.type} `:"";t.push(`${r}JOIN ${"string"==typeof e.table?e.table:`(${this._select(e.table)})`}${e.alias?` AS ${e.alias}`:""} ON ${e.on}`)}))," "+t.join(" ")}_groupBy(e){return e?"string"==typeof e?` GROUP BY ${e}`:` GROUP BY ${e.join(", ")}`:""}_having(e){return e?` HAVING ${e}`:""}_orderBy(e){if(!e)return"";if("string"==typeof e)return` ORDER BY ${e}`;if(Array.isArray(e))return` ORDER BY ${e.join(", ")}`;const t=[];return Object.entries(e).forEach((([e,r])=>{t.push(`${e} ${r}`)})),` ORDER BY ${t.join(", ")}`}_limit(e){return e?` LIMIT ${e}`:""}_offset(e){return e?` OFFSET ${e}`:""}_returning(e){return e?"string"==typeof e?` RETURNING ${e}`:` RETURNING ${e.join(", ")}`:""}}exports.D1QB=class extends a{db;constructor(e){super(),this.db=e}async execute(e){let t=this.db.prepare(e.query);if(this._debugger&&console.log({"workers-qb":{query:e.query,arguments:e.arguments,fetchType:e.fetchType}}),e.arguments&&(t=t.bind(...e.arguments)),e.fetchType===exports.FetchTypes.ONE||e.fetchType===exports.FetchTypes.ALL){const r=await t.all();return{changes:r.meta?.changes,duration:r.meta?.duration,last_row_id:r.meta?.last_row_id,served_by:r.meta?.served_by,success:r.success,results:e.fetchType===exports.FetchTypes.ONE?r.results[0]:r.results}}return t.run()}async batchExecute(e){this._debugger&&console.log({"workers-qb":e});const t=e.map((e=>{let t=this.db.prepare(e.query);return e.arguments&&(t=t.bind(...e.arguments)),t}));return(await this.db.batch(t)).map(((t,r)=>e[r]?{changes:t.meta?.changes,duration:t.meta?.duration,last_row_id:t.meta?.last_row_id,served_by:t.meta?.served_by,success:t.success,results:e[r].fetchType===exports.FetchTypes.ONE?t.results?.[0]:t.results}:{changes:t.meta?.changes,duration:t.meta?.duration,last_row_id:t.meta?.last_row_id,served_by:t.meta?.served_by,success:t.success}))}},exports.PGQB=class extends a{client;constructor(e){super(),this.client=e}async connect(){await this.client.connect()}async close(){await this.client.end()}async execute(e){const t=e.query.replaceAll("?","$");let r;return this._debugger&&console.log({"workers-qb":e}),r=e.arguments?await this.client.query({values:e.arguments,text:t}):await this.client.query({text:t}),e.fetchType===exports.FetchTypes.ONE||e.fetchType===exports.FetchTypes.ALL?{command:r.command,lastRowId:r.oid,rowCount:r.rowCount,results:e.fetchType===exports.FetchTypes.ONE?r.rows[0]:r.rows}:{command:r.command,lastRowId:r.oid,rowCount:r.rowCount}}},exports.Query=o,exports.QueryBuilder=a,exports.Raw=n;

package/dist/workers-qb.mjs

@@ -1 +1 @@
-var e,t,r,s;!function(e){e.ASC="ASC",e.DESC="DESC"}(e||(e={})),function(e){e.ONE="ONE",e.ALL="ALL"}(t||(t={})),function(e){e.ROLLBACK="ROLLBACK",e.ABORT="ABORT",e.FAIL="FAIL",e.IGNORE="IGNORE",e.REPLACE="REPLACE"}(r||(r={})),function(e){e.INNER="INNER",e.LEFT="LEFT",e.CROSS="CROSS"}(s||(s={}));class n{isRaw=!0;content;constructor(e){this.content=e}}class a{_debugger=!1;setDebugger(e){this._debugger=e}async execute(e){throw new Error("Execute method not implemented")}async createTable(e){return this.execute({query:`CREATE TABLE ${e.ifNotExists?"IF NOT EXISTS":""} ${e.tableName}\n              (\n                ${e.schema}\n              )`})}async dropTable(e){return this.execute({query:`DROP TABLE ${e.ifExists?"IF EXISTS":""} ${e.tableName}`})}async fetchOne(e){const r=await this.execute({query:this._select({...e,limit:1}),arguments:e.where?e.where.params:void 0,fetchType:t.ALL});return{...r,results:r.results.length>0?r.results[0]:null}}async fetchAll(e){return this.execute({query:this._select(e),arguments:e.where?e.where.params:void 0,fetchType:t.ALL})}async insert(e){let r=[];if(Array.isArray(e.data))for(const t of e.data)r=r.concat(this._parse_arguments(t));else r=r.concat(this._parse_arguments(e.data));const s=Array.isArray(e.data)?t.ALL:t.ONE;return this.execute({query:this._insert(e),arguments:r,fetchType:s})}async update(e){let r=this._parse_arguments(e.data);return e.where&&e.where.params&&(r=e.where.params.concat(r)),this.execute({query:this._update(e),arguments:r,fetchType:t.ALL})}async delete(e){return this.execute({query:this._delete(e),arguments:e.where?e.where.params:void 0,fetchType:t.ALL})}_parse_arguments(e){return Object.values(e).filter((e=>!(e instanceof n)))}_onConflict(e){return e?`OR ${e} `:""}_insert(e){const t=[];Array.isArray(e.data)||(e.data=[e.data]);const r=Object.keys(e.data[0]).join(", ");let s=1;for(const r of e.data){const e=[];Object.values(r).forEach((t=>{t instanceof n?e.push(t.content):(e.push(`?${s}`),s+=1)})),t.push(`(${e.join(", ")})`)}return`INSERT ${this._onConflict(e.onConflict)}INTO ${e.tableName} (${r}) VALUES ${t.join(", ")}`+this._returning(e.returning)}_update(e){const t=e.where&&e.where.params?Object.keys(e.where.params).length:0,r=[];let s=1;for(const[a,i]of Object.entries(e.data))i instanceof n?r.push(`${a} = ${i.content}`):(r.push(`${a} = ?${t+s}`),s+=1);return`UPDATE ${this._onConflict(e.onConflict)}${e.tableName} SET ${r.join(", ")}`+this._where(e.where?.conditions)+this._returning(e.returning)}_delete(e){return`DELETE FROM ${e.tableName}`+this._where(e.where?.conditions)+this._returning(e.returning)}_select(e){return`SELECT ${this._fields(e.fields)} FROM ${e.tableName}`+this._join(e.join)+this._where(e.where?.conditions)+this._groupBy(e.groupBy)+this._having(e.having)+this._orderBy(e.orderBy)+this._limit(e.limit)+this._offset(e.offset)}_fields(e){return"string"==typeof e?e:e.join(", ")}_where(e){return e?"string"==typeof e?` WHERE ${e}`:` WHERE ${e.join(" AND ")}`:""}_join(e){if(!e)return"";Array.isArray(e)||(e=[e]);const t=[];return e.forEach((e=>{const r=e.type?`${e.type} `:"";t.push(`${r}JOIN ${"string"==typeof e.table?e.table:`(${this._select(e.table)})`}${e.alias?` AS ${e.alias}`:""} ON ${e.on}`)}))," "+t.join(" ")}_groupBy(e){return e?"string"==typeof e?` GROUP BY ${e}`:` GROUP BY ${e.join(", ")}`:""}_having(e){return e?` HAVING ${e}`:""}_orderBy(e){if(!e)return"";if("string"==typeof e)return` ORDER BY ${e}`;if(Array.isArray(e))return` ORDER BY ${e.join(", ")}`;const t=[];return Object.entries(e).forEach((([e,r])=>{t.push(`${e} ${r}`)})),` ORDER BY ${t.join(", ")}`}_limit(e){return e?` LIMIT ${e}`:""}_offset(e){return e?` OFFSET ${e}`:""}_returning(e){return e?"string"==typeof e?` RETURNING ${e}`:` RETURNING ${e.join(", ")}`:""}}class i extends a{db;constructor(e){super(),this.db=e}async execute(e){let r=this.db.prepare(e.query);if(this._debugger&&console.log({"workers-qb":e}),e.arguments&&(r=r.bind(...e.arguments)),e.fetchType===t.ONE||e.fetchType===t.ALL){const s=await r.all();return{changes:s.meta?.changes,duration:s.meta?.duration,last_row_id:s.meta?.last_row_id,served_by:s.meta?.served_by,success:s.success,results:e.fetchType===t.ONE&&s.results.length>0?s.results[0]:s.results}}return r.run()}}class o extends a{client;constructor(e){super(),this.client=e}async connect(){await this.client.connect()}async close(){await this.client.end()}async execute(e){const r=e.query.replaceAll("?","$");let s;return this._debugger&&console.log({"workers-qb":e}),s=e.arguments?await this.client.query({values:e.arguments,text:r}):await this.client.query({text:r}),e.fetchType===t.ONE||e.fetchType===t.ALL?{command:s.command,lastRowId:s.oid,rowCount:s.rowCount,results:e.fetchType===t.ONE&&s.rows.length>0?s.rows[0]:s.rows}:null}}export{r as ConflictTypes,i as D1QB,t as FetchTypes,s as JoinTypes,e as OrderTypes,o as PGQB,a as QueryBuilder,n as Raw};
+var e,t,r,s;!function(e){e.ASC="ASC",e.DESC="DESC"}(e||(e={})),function(e){e.ONE="ONE",e.ALL="ALL"}(t||(t={})),function(e){e.ROLLBACK="ROLLBACK",e.ABORT="ABORT",e.FAIL="FAIL",e.IGNORE="IGNORE",e.REPLACE="REPLACE"}(r||(r={})),function(e){e.INNER="INNER",e.LEFT="LEFT",e.CROSS="CROSS"}(s||(s={}));class n{isRaw=!0;content;constructor(e){this.content=e}}class a{executeMethod;query;arguments;fetchType;constructor(e,t,r,s){this.executeMethod=e,this.query=t,this.arguments=r,this.fetchType=s}async execute(){return this.executeMethod(this)}}class i{_debugger=!1;setDebugger(e){this._debugger=e}async execute(e){throw new Error("Execute method not implemented")}async batchExecute(e){throw new Error("Batch execute method not implemented")}createTable(e){return new a((e=>this.execute(e)),`CREATE TABLE ${e.ifNotExists?"IF NOT EXISTS":""} ${e.tableName}\n              (\n                ${e.schema}\n              )`)}dropTable(e){return new a((e=>this.execute(e)),`DROP TABLE ${e.ifExists?"IF EXISTS":""} ${e.tableName}`)}fetchOne(e){return new a((e=>this.execute(e)),this._select({...e,limit:1}),e.where?e.where.params:void 0,t.ONE)}fetchAll(e){return new a((e=>this.execute(e)),this._select(e),e.where?e.where.params:void 0,t.ALL)}insert(e){let r=[];if(Array.isArray(e.data))for(const t of e.data)r=r.concat(this._parse_arguments(t));else r=r.concat(this._parse_arguments(e.data));const s=Array.isArray(e.data)?t.ALL:t.ONE;return new a((e=>this.execute(e)),this._insert(e),r,s)}update(e){let r=this._parse_arguments(e.data);return e.where&&e.where.params&&(r=e.where.params.concat(r)),new a((e=>this.execute(e)),this._update(e),r,t.ALL)}delete(e){return new a((e=>this.execute(e)),this._delete(e),e.where?e.where.params:void 0,t.ALL)}_parse_arguments(e){return Object.values(e).filter((e=>!(e instanceof n)))}_onConflict(e){return e?`OR ${e} `:""}_insert(e){const t=[];Array.isArray(e.data)||(e.data=[e.data]);const r=Object.keys(e.data[0]).join(", ");let s=1;for(const r of e.data){const e=[];Object.values(r).forEach((t=>{t instanceof n?e.push(t.content):(e.push(`?${s}`),s+=1)})),t.push(`(${e.join(", ")})`)}return`INSERT ${this._onConflict(e.onConflict)}INTO ${e.tableName} (${r}) VALUES ${t.join(", ")}`+this._returning(e.returning)}_update(e){const t=e.where&&e.where.params?Object.keys(e.where.params).length:0,r=[];let s=1;for(const[a,i]of Object.entries(e.data))i instanceof n?r.push(`${a} = ${i.content}`):(r.push(`${a} = ?${t+s}`),s+=1);return`UPDATE ${this._onConflict(e.onConflict)}${e.tableName} SET ${r.join(", ")}`+this._where(e.where?.conditions)+this._returning(e.returning)}_delete(e){return`DELETE FROM ${e.tableName}`+this._where(e.where?.conditions)+this._returning(e.returning)}_select(e){return`SELECT ${this._fields(e.fields)} FROM ${e.tableName}`+this._join(e.join)+this._where(e.where?.conditions)+this._groupBy(e.groupBy)+this._having(e.having)+this._orderBy(e.orderBy)+this._limit(e.limit)+this._offset(e.offset)}_fields(e){return"string"==typeof e?e:e.join(", ")}_where(e){return e?"string"==typeof e?` WHERE ${e}`:` WHERE ${e.join(" AND ")}`:""}_join(e){if(!e)return"";Array.isArray(e)||(e=[e]);const t=[];return e.forEach((e=>{const r=e.type?`${e.type} `:"";t.push(`${r}JOIN ${"string"==typeof e.table?e.table:`(${this._select(e.table)})`}${e.alias?` AS ${e.alias}`:""} ON ${e.on}`)}))," "+t.join(" ")}_groupBy(e){return e?"string"==typeof e?` GROUP BY ${e}`:` GROUP BY ${e.join(", ")}`:""}_having(e){return e?` HAVING ${e}`:""}_orderBy(e){if(!e)return"";if("string"==typeof e)return` ORDER BY ${e}`;if(Array.isArray(e))return` ORDER BY ${e.join(", ")}`;const t=[];return Object.entries(e).forEach((([e,r])=>{t.push(`${e} ${r}`)})),` ORDER BY ${t.join(", ")}`}_limit(e){return e?` LIMIT ${e}`:""}_offset(e){return e?` OFFSET ${e}`:""}_returning(e){return e?"string"==typeof e?` RETURNING ${e}`:` RETURNING ${e.join(", ")}`:""}}class o extends i{db;constructor(e){super(),this.db=e}async execute(e){let r=this.db.prepare(e.query);if(this._debugger&&console.log({"workers-qb":{query:e.query,arguments:e.arguments,fetchType:e.fetchType}}),e.arguments&&(r=r.bind(...e.arguments)),e.fetchType===t.ONE||e.fetchType===t.ALL){const s=await r.all();return{changes:s.meta?.changes,duration:s.meta?.duration,last_row_id:s.meta?.last_row_id,served_by:s.meta?.served_by,success:s.success,results:e.fetchType===t.ONE?s.results[0]:s.results}}return r.run()}async batchExecute(e){this._debugger&&console.log({"workers-qb":e});const r=e.map((e=>{let t=this.db.prepare(e.query);return e.arguments&&(t=t.bind(...e.arguments)),t}));return(await this.db.batch(r)).map(((r,s)=>e[s]?{changes:r.meta?.changes,duration:r.meta?.duration,last_row_id:r.meta?.last_row_id,served_by:r.meta?.served_by,success:r.success,results:e[s].fetchType===t.ONE?r.results?.[0]:r.results}:{changes:r.meta?.changes,duration:r.meta?.duration,last_row_id:r.meta?.last_row_id,served_by:r.meta?.served_by,success:r.success}))}}class c extends i{client;constructor(e){super(),this.client=e}async connect(){await this.client.connect()}async close(){await this.client.end()}async execute(e){const r=e.query.replaceAll("?","$");let s;return this._debugger&&console.log({"workers-qb":e}),s=e.arguments?await this.client.query({values:e.arguments,text:r}):await this.client.query({text:r}),e.fetchType===t.ONE||e.fetchType===t.ALL?{command:s.command,lastRowId:s.oid,rowCount:s.rowCount,results:e.fetchType===t.ONE?s.rows[0]:s.rows}:{command:s.command,lastRowId:s.oid,rowCount:s.rowCount}}}export{r as ConflictTypes,o as D1QB,t as FetchTypes,s as JoinTypes,e as OrderTypes,c as PGQB,a as Query,i as QueryBuilder,n as Raw};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "workers-qb",
-  "version": "0.1.12",
+  "version": "1.0.1",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/workers-qb.js",
   "types": "./dist/workers-qb.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/workers-qb.d.ts",
+      "types": "./dist/src/workers-qb.d.ts",
       "import": "./dist/workers-qb.mjs",
       "require": "./dist/workers-qb.js"
     }
@@ -17,7 +17,6 @@
     "README.md"
   ],
   "scripts": {
-    "_postinstall": "husky install",
     "prepublishOnly": "pinst --disable",
     "postpublish": "pinst --enable",
     "build": "rollup -c",
@@ -25,7 +24,7 @@
     "test": "jest --no-cache --runInBand",
     "test:cov": "jest --coverage --no-cache --runInBand",
     "addscope": "node tools/packagejson name @g4brym/workers-qb",
-    "prettify": "prettier . --write --ignore-unknown",
+    "prettify": "prettier --check . || (prettier -w .; exit 1)",
     "prepare": "husky install"
   },
   "publishConfig": {

package/dist/databases/d1.d.ts

@@ -1,13 +0,0 @@
-import { QueryBuilder } from '../Builder';
-import { FetchTypes } from '../enums';
-import { Raw } from '../tools';
-import { D1Result, D1ResultOne } from '../interfaces';
-export declare class D1QB extends QueryBuilder<D1Result, D1ResultOne> {
-    private db;
-    constructor(db: any);
-    execute(params: {
-        query: string;
-        arguments?: (string | number | boolean | null | Raw)[];
-        fetchType?: FetchTypes;
-    }): Promise<any>;
-}

package/dist/tools.d.ts

@@ -1,5 +0,0 @@
-export declare class Raw {
-    isRaw: boolean;
-    content: any;
-    constructor(content: any);
-}