workers-qb 0.1.7 → 0.1.8

package/README.md

@@ -1,15 +1,19 @@
 # workers-qb
 
-Zero dependencies Query Builder for [Cloudflare D1](https://blog.cloudflare.com/introducing-d1/)
-[Workers](https://developers.cloudflare.com/workers/)
+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 traditional ORM.
+This module provides a simple standardized interface while keeping the benefits and speed of using raw queries over a
+traditional ORM.
 
-`workers-qb` is not intended to provide ORM-like functionality, rather to make it easier to interact with the database from
-code for direct SQL access using convenient wrapper methods.
+`workers-qb` is not intended to provide ORM-like functionality, rather to make it easier to interact with the database
+from code for direct SQL access using convenient wrapper methods.
 
-Read the documentation [Here](https://workers-qb.massadas.com/)!
+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
 
@@ -21,30 +25,86 @@ Read the documentation [Here](https://workers-qb.massadas.com/)!
 - [x] Create/drop tables
 - [x] Keep where conditions simple in code
 - [x] Bulk insert
+- [x] Workers D1 Support
+- [x] Workers PostgreSQL Support
 - [ ] Named parameters (waiting for full support in D1)
 
 ## Installation
 
 ```
-npm install workers-qb
+npm install workers-qb --save
 ```
 
-## Basic Usage
+## Example Cloudflare D1 Usage
 
 ```ts
 import { D1QB } from 'workers-qb'
-const qb = new D1QB(env.DB)
 
-const fetched = await qb.fetchOne({
-  tableName: 'employees',
-  fields: 'count(*) as count',
-  where: {
-    conditions: 'active = ?1',
-    params: [true],
+export interface Env {
+  DB: any
+}
+
+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],
+      },
+    })
+
+    return Response.json({
+      activeEmployees: fetched.results?.count || 0,
+    })
   },
-})
+}
+```
+
+## Example Cloudflare Workers with PostgreSQL Usage
+
+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
+a connection pool in front of your PostgreSQL.
 
-console.log(`Company has ${fetched.results.count} active employees`)
+You must also enable `node_compat = true` in your `wrangler.toml`
+
+You need to install `node-postgres`:
+
+```bash
+npm install pg --save
+```
+
+```ts
+import { PGQB } from 'workers-qb'
+
+export interface Env {
+  DB_URL: string
+}
+
+export default {
+  async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+    const qb = new PGQB(env.DB_URL)
+    await qb.connect()
+
+    const fetched = await qb.fetchOne({
+      tableName: 'employees',
+      fields: 'count(*) as count',
+      where: {
+        conditions: 'active = ?1',
+        params: [true],
+      },
+    })
+
+    ctx.waitUntil(qb.close())
+    return Response.json({
+      activeEmployees: fetched.results?.count || 0,
+    })
+  },
+}
 ```
 
 #### Fetching a single record
@@ -189,108 +249,3 @@ const dropped = await qb.dropTable({
   tableName: 'testTable',
 })
 ```
-
-## Development
-
-### Set up tools and environment
-
-You need to have [Node.js](https://nodejs.org/en/download/) installed. Node includes npm as its default package manager.
-
-Open the whole package folder with a good code editor, preferably [Visual Studio Code](https://code.visualstudio.com/download). Consider installing VS Code extensions [ES Lint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode).
-
-In the VS Code top menu: **Terminal** -> **New Terminal**
-
-### Install dependencies
-
-Install dependencies with npm:
-
-```bash
-npm i
-```
-
-### Write your code
-
-Write your code in **src** folder, and unit test in **test** folder.
-
-The VS Code shortcuts for formatting of a code file are: <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>F</kbd> (Windows); <kbd>Shift</kbd> + <kbd>Option (Alt)</kbd> + <kbd>F</kbd> (MacOS); <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd> (Linux).
-
-### Test
-
-Test your code with Jest framework:
-
-```bash
-npm run test
-```
-
-**Note:** This project uses [husky](https://typicode.github.io/husky/), [pinst](https://github.com/typicode/pinst) and [commitlint](https://commitlint.js.org/) to automatically execute test and [lint commit message](https://www.conventionalcommits.org/) before every commit.
-
-### Build
-
-Build production (distribution) files in your **dist** folder:
-
-```bash
-npm run build
-```
-
-It generates CommonJS (in **dist/cjs** folder), ES Modules (in **dist/esm** folder), bundled and minified UMD (in **dist/umd** folder), as well as TypeScript declaration files (in **dist/types** folder).
-
-### Try it before publishing
-
-Run:
-
-```bash
-npm link
-```
-
-[npm link](https://docs.npmjs.com/cli/v6/commands/npm-link) will create a symlink in the global folder, which may be **{prefix}/lib/node_modules/workers-qb** or **C:\Users\<username>\AppData\Roaming\npm\node_modules\workers-qb**.
-
-Create an empty folder elsewhere, you don't even need to `npm init` (to generate **package.json**). Open the folder with VS Code, open a terminal and just run:
-
-```bash
-npm link workers-qb
-```
-
-This will create a symbolic link from globally-installed workers-qb to **node_modules/** of the current folder.
-
-You can then create a, for example, **testsql.ts** file with the content:
-
-```ts
-import { D1QB } from 'workers-qb'
-const qb = new D1QB(env.DB)
-
-console.log('Creating table...')
-const created = await qb.createTable({
-  tableName: 'testTable',
-  schema: `
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      name TEXT NOT NULL
-    `,
-  ifNotExists: true,
-})
-console.log(created)
-
-console.log('Inserting rows...')
-const inserted = await qb.insert({
-  tableName: 'testTable',
-  data: {
-    name: 'my name',
-  },
-  returning: '*',
-})
-console.log(inserted)
-
-console.log('Selecting rows...')
-const selected = await qb.fetchAll({
-  tableName: 'testTable',
-  fields: '*',
-})
-console.log(selected)
-```
-
-If you don't see any linting errors in VS Code, if you put your mouse cursor over `D1QB` and see its type, then it's all good.
-
-Whenever you want to uninstall the globally-installed workers-qb and remove the symlink in the global folder, run:
-
-```bash
-npm uninstall workers-qb -g
-```

package/dist/Builder.d.ts

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

package/dist/databases/d1.d.ts

@@ -0,0 +1,13 @@
+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/databases/pg.d.ts

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

package/dist/interfaces.d.ts

@@ -40,19 +40,31 @@ export interface Delete {
     where: Where;
     returning?: string | Array<string>;
 }
-export interface Result {
+export interface D1Result {
     changes?: number;
     duration: number;
-    lastRowId?: number;
+    lastRowId?: string | number;
     results?: Array<Record<string, string | boolean | number | null>>;
     served_by: string;
     success: boolean;
 }
-export interface ResultOne {
+export interface D1ResultOne {
     changes?: number;
     duration: number;
-    lastRowId?: number;
+    lastRowId?: string | number;
     results?: Record<string, string | boolean | number | null>;
     served_by: string;
     success: boolean;
 }
+export interface PGResult {
+    command: string;
+    lastRowId?: string | number;
+    rowCount: number;
+    results?: Array<Record<string, string | boolean | number | null>>;
+}
+export interface PGResultOne {
+    command: string;
+    lastRowId?: string | number;
+    rowCount: number;
+    results?: Record<string, string | boolean | number | null>;
+}

package/dist/workers-qb.d.ts

@@ -1,5 +1,6 @@
 export * from './Builder';
-export * from './Databases';
+export * from './databases/d1';
+export * from './databases/pg';
 export * from './enums';
 export * from './interfaces';
 export * from './tools';

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 i{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[0]}}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));return this.execute({query:this._insert(e),arguments:t,fetchType:exports.FetchTypes.ALL})}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).map((e=>e instanceof n?e.content:e))}_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.entries(r).forEach((([t,r])=>{r instanceof n?e.push(r.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=[];return Object.entries(e.data).forEach((([e,s],i)=>{s instanceof n?r.push(`${e} = ${s.content}`):r.push(`${e} = ?${t+i+1}`)})),`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 ${e.table} 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 i{db;constructor(e){super(),this.db=e}async execute(e){let t=this.db.prepare(e.query);if(e.arguments){const r=e.arguments.map((e=>e instanceof n?e.content:e));t=t.bind(...r)}return e.fetchType===exports.FetchTypes.ONE?t.first():e.fetchType===exports.FetchTypes.ALL?t.all():t.run()}},exports.QueryBuilder=i,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 i{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));return this.execute({query:this._insert(e),arguments:t,fetchType:exports.FetchTypes.ALL})}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).map((e=>e instanceof n?e.content:e))}_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=[];return Object.entries(e.data).forEach((([e,s],i)=>{s instanceof n?r.push(`${e} = ${s.content}`):r.push(`${e} = ?${t+i+1}`)})),`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 ${e.table} 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(", ")}`:""}}let o;try{o=require("pg")}catch(e){o=null}exports.D1QB=class extends i{db;constructor(e){super(),this.db=e}async execute(e){let t=this.db.prepare(e.query);if(e.arguments){const r=e.arguments.map((e=>e instanceof n?e.content:e));t=t.bind(...r)}return e.fetchType===exports.FetchTypes.ONE?t.first():e.fetchType===exports.FetchTypes.ALL?t.all():t.run()}},exports.PGQB=class extends i{dbUrl;client;constructor(e){if(null===o)throw new Error('You must have "pg" installed, in order to use PGQB!');super(),this.dbUrl=e,this.client=new o.Client(this.dbUrl)}async connect(){await this.client.connect()}async close(){await this.client.end()}async execute(e){const t=e.query.replaceAll("?","$");let r;if(e.arguments){const s=e.arguments.map((e=>e instanceof n?e.content:e));r=await this.client.query({values:s,text:t})}else r=await this.client.query({text:t});return e.fetchType===exports.FetchTypes.ONE||e.fetchType===exports.FetchTypes.ALL?{command:r.command,lastRowId:r.oid,rowCount:r.rowCount,results:r.rows}:null}},exports.QueryBuilder=i,exports.Raw=n;

package/dist/workers-qb.mjs

@@ -1 +1 @@
-var e,t,r,n;!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"}(n||(n={}));class s{isRaw=!0;content;constructor(e){this.content=e}}class i{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[0]}}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));return this.execute({query:this._insert(e),arguments:r,fetchType:t.ALL})}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).map((e=>e instanceof s?e.content:e))}_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 n=1;for(const r of e.data){const e=[];Object.entries(r).forEach((([t,r])=>{r instanceof s?e.push(r.content):e.push(`?${n}`),n+=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=[];return Object.entries(e.data).forEach((([e,n],i)=>{n instanceof s?r.push(`${e} = ${n.content}`):r.push(`${e} = ?${t+i+1}`)})),`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 ${e.table} 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 a extends i{db;constructor(e){super(),this.db=e}async execute(e){let r=this.db.prepare(e.query);if(e.arguments){const t=e.arguments.map((e=>e instanceof s?e.content:e));r=r.bind(...t)}return e.fetchType===t.ONE?r.first():e.fetchType===t.ALL?r.all():r.run()}}export{r as ConflictTypes,a as D1QB,t as FetchTypes,n as JoinTypes,e as OrderTypes,i as QueryBuilder,s as Raw};
+var e,t,r,n;!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"}(n||(n={}));class s{isRaw=!0;content;constructor(e){this.content=e}}class i{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));return this.execute({query:this._insert(e),arguments:r,fetchType:t.ALL})}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).map((e=>e instanceof s?e.content:e))}_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 n=1;for(const r of e.data){const e=[];Object.values(r).forEach((t=>{t instanceof s?e.push(t.content):e.push(`?${n}`),n+=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=[];return Object.entries(e.data).forEach((([e,n],i)=>{n instanceof s?r.push(`${e} = ${n.content}`):r.push(`${e} = ?${t+i+1}`)})),`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 ${e.table} 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 a extends i{db;constructor(e){super(),this.db=e}async execute(e){let r=this.db.prepare(e.query);if(e.arguments){const t=e.arguments.map((e=>e instanceof s?e.content:e));r=r.bind(...t)}return e.fetchType===t.ONE?r.first():e.fetchType===t.ALL?r.all():r.run()}}let c;try{c=require("pg")}catch(e){c=null}class o extends i{dbUrl;client;constructor(e){if(null===c)throw new Error('You must have "pg" installed, in order to use PGQB!');super(),this.dbUrl=e,this.client=new c.Client(this.dbUrl)}async connect(){await this.client.connect()}async close(){await this.client.end()}async execute(e){const r=e.query.replaceAll("?","$");let n;if(e.arguments){const t=e.arguments.map((e=>e instanceof s?e.content:e));n=await this.client.query({values:t,text:r})}else n=await this.client.query({text:r});return e.fetchType===t.ONE||e.fetchType===t.ALL?{command:n.command,lastRowId:n.oid,rowCount:n.rowCount,results:n.rows}:null}}export{r as ConflictTypes,a as D1QB,t as FetchTypes,n as JoinTypes,e as OrderTypes,o as PGQB,i as QueryBuilder,s as Raw};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "workers-qb",
-  "version": "0.1.7",
-  "description": "Zero dependencies Query Builder for Cloudflare D1 Workers",
+  "version": "0.1.8",
+  "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/workers-qb.js",
   "types": "./dist/workers-qb.d.ts",
   "exports": {
@@ -21,7 +21,6 @@
     "prepublishOnly": "pinst --disable",
     "postpublish": "pinst --enable",
     "build": "rollup -c",
-    "clean": "node tools/cleanup",
     "package": "npm run build && npm pack",
     "test": "jest --no-cache --runInBand",
     "test:cov": "jest --coverage --no-cache --runInBand",
@@ -69,6 +68,8 @@
   "devDependencies": {
     "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^13.1.0",
+    "@rollup/plugin-terser": "^0.2.1",
+    "@rollup/plugin-typescript": "^10.0.1",
     "@types/jest": "^27.0.1",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
@@ -79,11 +80,12 @@
     "jest": "^28.1.2",
     "pinst": "^2.1.6",
     "prettier": "^2.4.0",
-    "ts-jest": "^28.0.5",
-    "@rollup/plugin-terser": "^0.2.1",
-    "@rollup/plugin-typescript": "^10.0.1",
     "rollup": "^3.8.1",
     "rollup-plugin-bundle-size": "^1.0.3",
+    "ts-jest": "^28.0.5",
     "typescript": "^4.8.4"
+  },
+  "optionalDependencies": {
+    "pg": "^8.11.0"
   }
 }

package/dist/Databases.d.ts

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