workers-qb 0.1.3 → 0.1.4

package/README.md

@@ -16,7 +16,8 @@ Read the documentation [Here](https://workers-qb.massadas.com/)!
 - [x] Zero dependencies.
 - [x] Fully typed/TypeScript support
 - [x] SQL Type checking with compatible IDE's
-- [x] Insert/Update/Select/Delete queries
+- [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
 - [ ] Bulk insert/update
@@ -92,6 +93,7 @@ fetched.results.forEach((employee) => {
 #### Inserting rows
 
 ```ts
+import { Raw } from 'workers-qb'
 const qb = new D1QB(env.DB)
 
 const inserted = await qb.insert({
@@ -100,6 +102,7 @@ const inserted = await qb.insert({
     name: 'Joe',
     role: 'manager',
     department: 'store',
+    created_at: new Raw('CURRENT_TIMESTAMP'),
   },
   returning: '*',
 })

package/dist/cjs/Builder.js

@@ -49,6 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBuilder = void 0;
 var enums_1 = require("./enums");
+var tools_1 = require("./tools");
 var QueryBuilder = /** @class */ (function () {
     function QueryBuilder() {
     }
@@ -63,7 +64,7 @@ var QueryBuilder = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.execute({
-                        query: "CREATE TABLE " + (params.ifNotExists ? 'IF NOT EXISTS' : '') + " " + params.tableName + " (" + params.schema + ")",
+                        query: "CREATE TABLE " + (params.ifNotExists ? 'IF NOT EXISTS' : '') + " " + params.tableName + "\n              (\n                " + params.schema + "\n              )",
                     })];
             });
         });
@@ -118,12 +119,20 @@ var QueryBuilder = /** @class */ (function () {
     };
     QueryBuilder.prototype.update = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var args;
             return __generator(this, function (_a) {
+                args = Object.values(params.data);
+                if (params.where && params.where.params) {
+                    args = params.where.params.concat(Object.values(params.data).map(function (value) {
+                        if (value instanceof tools_1.Raw) {
+                            return value.content;
+                        }
+                        return value;
+                    }));
+                }
                 return [2 /*return*/, this.execute({
                         query: this._update(params),
-                        arguments: params.where && params.where.params
-                            ? params.where.params.concat(Object.values(params.data))
-                            : Object.values(params.data),
+                        arguments: args,
                         fetchType: enums_1.FetchTypes.ALL,
                     })];
             });
@@ -149,10 +158,18 @@ var QueryBuilder = /** @class */ (function () {
     QueryBuilder.prototype._insert = function (params) {
         var columns = Object.keys(params.data).join(', ');
         var values = [];
-        Object.keys(params.data).forEach(function (key, index) {
-            values.push("?" + (index + 1));
+        Object.entries(params.data).forEach(function (_a, index) {
+            var key = _a[0], value = _a[1];
+            if (value instanceof tools_1.Raw) {
+                values.push(value.content);
+            }
+            else {
+                values.push("?" + (index + 1));
+            }
         });
-        return ("INSERT " + this._onConflict(params.onConflict) + "INTO " + params.tableName + " (" + columns + ") VALUES(" + values.join(', ') + ")" + this._returning(params.returning));
+        return ("INSERT " + this._onConflict(params.onConflict) + "INTO " + params.tableName + " (" + columns + ")" +
+            (" VALUES(" + values.join(', ') + ")") +
+            this._returning(params.returning));
     };
     QueryBuilder.prototype._update = function (params) {
         var _a;
@@ -160,7 +177,12 @@ var QueryBuilder = /** @class */ (function () {
         var set = [];
         Object.entries(params.data).forEach(function (_a, index) {
             var key = _a[0], value = _a[1];
-            set.push(key + " = ?" + (whereParamsLength + index + 1));
+            if (value instanceof tools_1.Raw) {
+                set.push(key + " = " + value.content);
+            }
+            else {
+                set.push(key + " = ?" + (whereParamsLength + index + 1));
+            }
         });
         return ("UPDATE " + this._onConflict(params.onConflict) + params.tableName + " SET " + set.join(', ') +
             this._where((_a = params.where) === null || _a === void 0 ? void 0 : _a.conditions) +
@@ -196,8 +218,15 @@ var QueryBuilder = /** @class */ (function () {
     QueryBuilder.prototype._join = function (value) {
         if (!value)
             return '';
-        var type = value.type ? " " + value.type : '';
-        return type + " JOIN " + value.table + " ON " + value.on;
+        if (!Array.isArray(value)) {
+            value = [value];
+        }
+        var joinQuery = [];
+        value.forEach(function (item) {
+            var type = item.type ? item.type + " " : '';
+            joinQuery.push(type + "JOIN " + item.table + " ON " + item.on);
+        });
+        return ' ' + joinQuery.join(' ');
     };
     QueryBuilder.prototype._groupBy = function (value) {
         if (!value)
@@ -216,8 +245,7 @@ var QueryBuilder = /** @class */ (function () {
             return '';
         if (typeof value === 'string')
             return " ORDER BY " + value;
-        if (value.constructor.name.toLowerCase() === 'array') {
-            // @ts-ignore
+        if (Array.isArray(value)) {
             return " ORDER BY " + value.join(', ');
         }
         var order = [];

package/dist/cjs/Databases.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.D1QB = void 0;
 var Builder_1 = require("./Builder");
 var enums_1 = require("./enums");
+var tools_1 = require("./tools");
 var D1QB = /** @class */ (function (_super) {
     __extends(D1QB, _super);
     function D1QB(db) {
@@ -63,11 +64,17 @@ var D1QB = /** @class */ (function (_super) {
     }
     D1QB.prototype.execute = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var stmt;
+            var stmt, args;
             return __generator(this, function (_a) {
                 stmt = this.db.prepare(params.query);
                 if (params.arguments) {
-                    stmt = stmt.bind.apply(stmt, params.arguments);
+                    args = params.arguments.map(function (value) {
+                        if (value instanceof tools_1.Raw) {
+                            return value.content;
+                        }
+                        return value;
+                    });
+                    stmt = stmt.bind.apply(stmt, args);
                 }
                 if (params.fetchType === enums_1.FetchTypes.ONE) {
                     return [2 /*return*/, stmt.first()];

package/dist/cjs/tools.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Raw = void 0;
+var Raw = /** @class */ (function () {
+    function Raw(content) {
+        this.isRaw = true;
+        this.content = content;
+    }
+    return Raw;
+}());
+exports.Raw = Raw;

package/dist/esm/Builder.js

@@ -46,6 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { FetchTypes } from './enums';
+import { Raw } from './tools';
 var QueryBuilder = /** @class */ (function () {
     function QueryBuilder() {
     }
@@ -60,7 +61,7 @@ var QueryBuilder = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.execute({
-                        query: "CREATE TABLE " + (params.ifNotExists ? 'IF NOT EXISTS' : '') + " " + params.tableName + " (" + params.schema + ")",
+                        query: "CREATE TABLE " + (params.ifNotExists ? 'IF NOT EXISTS' : '') + " " + params.tableName + "\n              (\n                " + params.schema + "\n              )",
                     })];
             });
         });
@@ -115,12 +116,20 @@ var QueryBuilder = /** @class */ (function () {
     };
     QueryBuilder.prototype.update = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var args;
             return __generator(this, function (_a) {
+                args = Object.values(params.data);
+                if (params.where && params.where.params) {
+                    args = params.where.params.concat(Object.values(params.data).map(function (value) {
+                        if (value instanceof Raw) {
+                            return value.content;
+                        }
+                        return value;
+                    }));
+                }
                 return [2 /*return*/, this.execute({
                         query: this._update(params),
-                        arguments: params.where && params.where.params
-                            ? params.where.params.concat(Object.values(params.data))
-                            : Object.values(params.data),
+                        arguments: args,
                         fetchType: FetchTypes.ALL,
                     })];
             });
@@ -146,10 +155,18 @@ var QueryBuilder = /** @class */ (function () {
     QueryBuilder.prototype._insert = function (params) {
         var columns = Object.keys(params.data).join(', ');
         var values = [];
-        Object.keys(params.data).forEach(function (key, index) {
-            values.push("?" + (index + 1));
+        Object.entries(params.data).forEach(function (_a, index) {
+            var key = _a[0], value = _a[1];
+            if (value instanceof Raw) {
+                values.push(value.content);
+            }
+            else {
+                values.push("?" + (index + 1));
+            }
         });
-        return ("INSERT " + this._onConflict(params.onConflict) + "INTO " + params.tableName + " (" + columns + ") VALUES(" + values.join(', ') + ")" + this._returning(params.returning));
+        return ("INSERT " + this._onConflict(params.onConflict) + "INTO " + params.tableName + " (" + columns + ")" +
+            (" VALUES(" + values.join(', ') + ")") +
+            this._returning(params.returning));
     };
     QueryBuilder.prototype._update = function (params) {
         var _a;
@@ -157,7 +174,12 @@ var QueryBuilder = /** @class */ (function () {
         var set = [];
         Object.entries(params.data).forEach(function (_a, index) {
             var key = _a[0], value = _a[1];
-            set.push(key + " = ?" + (whereParamsLength + index + 1));
+            if (value instanceof Raw) {
+                set.push(key + " = " + value.content);
+            }
+            else {
+                set.push(key + " = ?" + (whereParamsLength + index + 1));
+            }
         });
         return ("UPDATE " + this._onConflict(params.onConflict) + params.tableName + " SET " + set.join(', ') +
             this._where((_a = params.where) === null || _a === void 0 ? void 0 : _a.conditions) +
@@ -193,8 +215,15 @@ var QueryBuilder = /** @class */ (function () {
     QueryBuilder.prototype._join = function (value) {
         if (!value)
             return '';
-        var type = value.type ? " " + value.type : '';
-        return type + " JOIN " + value.table + " ON " + value.on;
+        if (!Array.isArray(value)) {
+            value = [value];
+        }
+        var joinQuery = [];
+        value.forEach(function (item) {
+            var type = item.type ? item.type + " " : '';
+            joinQuery.push(type + "JOIN " + item.table + " ON " + item.on);
+        });
+        return ' ' + joinQuery.join(' ');
     };
     QueryBuilder.prototype._groupBy = function (value) {
         if (!value)
@@ -213,8 +242,7 @@ var QueryBuilder = /** @class */ (function () {
             return '';
         if (typeof value === 'string')
             return " ORDER BY " + value;
-        if (value.constructor.name.toLowerCase() === 'array') {
-            // @ts-ignore
+        if (Array.isArray(value)) {
             return " ORDER BY " + value.join(', ');
         }
         var order = [];

package/dist/esm/Databases.js

@@ -51,6 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { QueryBuilder } from './Builder';
 import { FetchTypes } from './enums';
+import { Raw } from './tools';
 var D1QB = /** @class */ (function (_super) {
     __extends(D1QB, _super);
     function D1QB(db) {
@@ -60,11 +61,17 @@ var D1QB = /** @class */ (function (_super) {
     }
     D1QB.prototype.execute = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var stmt;
+            var stmt, args;
             return __generator(this, function (_a) {
                 stmt = this.db.prepare(params.query);
                 if (params.arguments) {
-                    stmt = stmt.bind.apply(stmt, params.arguments);
+                    args = params.arguments.map(function (value) {
+                        if (value instanceof Raw) {
+                            return value.content;
+                        }
+                        return value;
+                    });
+                    stmt = stmt.bind.apply(stmt, args);
                 }
                 if (params.fetchType === FetchTypes.ONE) {
                     return [2 /*return*/, stmt.first()];

package/dist/esm/tools.js

@@ -0,0 +1,8 @@
+var Raw = /** @class */ (function () {
+    function Raw(content) {
+        this.isRaw = true;
+        this.content = content;
+    }
+    return Raw;
+}());
+export { Raw };

package/dist/types/Builder.d.ts

@@ -1,9 +1,10 @@
 import { Delete, Insert, Join, Result, ResultOne, SelectAll, SelectOne, Update } from './interfaces';
 import { ConflictTypes, FetchTypes, OrderTypes } from './enums';
+import { Raw } from './tools';
 export declare class QueryBuilder {
     execute(params: {
-        query: String;
-        arguments?: (string | number | boolean | null)[];
+        query: string;
+        arguments?: (string | number | boolean | null | Raw)[];
         fetchType?: FetchTypes;
     }): Promise<any>;
     createTable(params: {
@@ -27,7 +28,7 @@ export declare class QueryBuilder {
     _select(params: SelectAll): string;
     _fields(value: string | Array<string>): string;
     _where(value?: string | Array<string>): string;
-    _join(value?: Join): string;
+    _join(value?: Join | Array<Join>): string;
     _groupBy(value?: string | Array<string>): string;
     _having(value?: string): string;
     _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;

package/dist/types/Databases.d.ts

@@ -1,11 +1,12 @@
 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)[];
+        query: string;
+        arguments?: (string | number | boolean | null | Raw)[];
         fetchType?: FetchTypes;
     }): Promise<any>;
 }

package/dist/types/interfaces.d.ts

@@ -1,4 +1,5 @@
 import { ConflictTypes, JoinTypes, OrderTypes } from './enums';
+import { Raw } from './tools';
 export interface Where {
     conditions: string | Array<string>;
     params?: (string | boolean | number | null)[];
@@ -12,7 +13,7 @@ export interface SelectOne {
     tableName: string;
     fields: string | Array<string>;
     where?: Where;
-    join?: Join;
+    join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
     having?: string;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
@@ -23,13 +24,13 @@ export interface SelectAll extends SelectOne {
 }
 export interface Insert {
     tableName: string;
-    data: Record<string, string | boolean | number | null>;
+    data: Record<string, string | boolean | number | null | Raw>;
     returning?: string | Array<string>;
     onConflict?: string | ConflictTypes;
 }
 export interface Update {
     tableName: string;
-    data: Record<string, string | boolean | number | null>;
+    data: Record<string, string | boolean | number | null | Raw>;
     where: Where;
     returning?: string | Array<string>;
     onConflict?: string | ConflictTypes;

package/dist/types/tools.d.ts

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

package/dist/umd/index.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["workers-qb"]=t():e["workers-qb"]=t()}(this,(function(){return(()=>{"use strict";var e={501:function(e,t,r){var n=this&&this.__assign||function(){return n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e},n.apply(this,arguments)},o=this&&this.__awaiter||function(e,t,r,n){return new(r||(r=Promise))((function(o,i){function u(e){try{s(n.next(e))}catch(e){i(e)}}function c(e){try{s(n.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(u,c)}s((n=n.apply(e,t||[])).next())}))},i=this&&this.__generator||function(e,t){var r,n,o,i,u={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(r)throw new TypeError("Generator is already executing.");for(;u;)try{if(r=1,n&&(o=2&i[0]?n.return:i[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,i[1])).done)return o;switch(n=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return u.label++,{value:i[1],done:!1};case 5:u.label++,n=i[1],i=[0];continue;case 7:i=u.ops.pop(),u.trys.pop();continue;default:if(!((o=(o=u.trys).length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){u.label=i[1];break}if(6===i[0]&&u.label<o[1]){u.label=o[1],o=i;break}if(o&&u.label<o[2]){u.label=o[2],u.ops.push(i);break}o[2]&&u.ops.pop(),u.trys.pop();continue}i=t.call(e,u)}catch(e){i=[6,e],n=0}finally{r=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}};Object.defineProperty(t,"__esModule",{value:!0}),t.QueryBuilder=void 0;var u=r(40),c=function(){function e(){}return e.prototype.execute=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(e){throw new Error("Execute method not implemented")}))}))},e.prototype.createTable=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:"CREATE TABLE "+(e.ifNotExists?"IF NOT EXISTS":"")+" "+e.tableName+" ("+e.schema+")"})]}))}))},e.prototype.dropTable=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:"DROP TABLE "+(e.ifExists?"IF EXISTS":"")+" "+e.tableName})]}))}))},e.prototype.fetchOne=function(e){return o(this,void 0,void 0,(function(){var t;return i(this,(function(r){switch(r.label){case 0:return[4,this.execute({query:this._select(n(n({},e),{limit:1})),arguments:e.where?e.where.params:void 0,fetchType:u.FetchTypes.ALL})];case 1:return t=r.sent(),[2,n(n({},t),{results:t.results[0]})]}}))}))},e.prototype.fetchAll=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._select(e),arguments:e.where?e.where.params:void 0,fetchType:u.FetchTypes.ALL})]}))}))},e.prototype.insert=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._insert(e),arguments:Object.values(e.data),fetchType:u.FetchTypes.ALL})]}))}))},e.prototype.update=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._update(e),arguments:e.where&&e.where.params?e.where.params.concat(Object.values(e.data)):Object.values(e.data),fetchType:u.FetchTypes.ALL})]}))}))},e.prototype.delete=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._delete(e),arguments:e.where?e.where.params:void 0,fetchType:u.FetchTypes.ALL})]}))}))},e.prototype._onConflict=function(e){return e?"OR "+e+" ":""},e.prototype._insert=function(e){var t=Object.keys(e.data).join(", "),r=[];return Object.keys(e.data).forEach((function(e,t){r.push("?"+(t+1))})),"INSERT "+this._onConflict(e.onConflict)+"INTO "+e.tableName+" ("+t+") VALUES("+r.join(", ")+")"+this._returning(e.returning)},e.prototype._update=function(e){var t,r=e.where&&e.where.params?Object.keys(e.where.params).length:0,n=[];return Object.entries(e.data).forEach((function(e,t){var o=e[0];e[1],n.push(o+" = ?"+(r+t+1))})),"UPDATE "+this._onConflict(e.onConflict)+e.tableName+" SET "+n.join(", ")+this._where(null===(t=e.where)||void 0===t?void 0:t.conditions)+this._returning(e.returning)},e.prototype._delete=function(e){var t;return"DELETE FROM "+e.tableName+this._where(null===(t=e.where)||void 0===t?void 0:t.conditions)+this._returning(e.returning)},e.prototype._select=function(e){var t;return"SELECT "+this._fields(e.fields)+" FROM "+e.tableName+this._join(e.join)+this._where(null===(t=e.where)||void 0===t?void 0:t.conditions)+this._groupBy(e.groupBy)+this._having(e.having)+this._orderBy(e.orderBy)+this._limit(e.limit)+this._offset(e.offset)},e.prototype._fields=function(e){return"string"==typeof e?e:e.join(", ")},e.prototype._where=function(e){return e?"string"==typeof e?" WHERE "+e:" WHERE "+e.join(" AND "):""},e.prototype._join=function(e){return e?(e.type?" "+e.type:"")+" JOIN "+e.table+" ON "+e.on:""},e.prototype._groupBy=function(e){return e?"string"==typeof e?" GROUP BY "+e:" GROUP BY "+e.join(", "):""},e.prototype._having=function(e){return e?" HAVING "+e:""},e.prototype._orderBy=function(e){if(!e)return"";if("string"==typeof e)return" ORDER BY "+e;if("array"===e.constructor.name.toLowerCase())return" ORDER BY "+e.join(", ");var t=[];return Object.entries(e).forEach((function(e){var r=e[0],n=e[1];t.push(r+" "+n)}))," ORDER BY "+t.join(", ")},e.prototype._limit=function(e){return e?" LIMIT "+e:""},e.prototype._offset=function(e){return e?" OFFSET "+e:""},e.prototype._returning=function(e){return e?"string"==typeof e?" RETURNING "+e:" RETURNING "+e.join(", "):""},e}();t.QueryBuilder=c},513:function(e,t,r){var n,o=this&&this.__extends||(n=function(e,t){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])},n(e,t)},function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function r(){this.constructor=e}n(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}),i=this&&this.__awaiter||function(e,t,r,n){return new(r||(r=Promise))((function(o,i){function u(e){try{s(n.next(e))}catch(e){i(e)}}function c(e){try{s(n.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(u,c)}s((n=n.apply(e,t||[])).next())}))},u=this&&this.__generator||function(e,t){var r,n,o,i,u={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(r)throw new TypeError("Generator is already executing.");for(;u;)try{if(r=1,n&&(o=2&i[0]?n.return:i[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,i[1])).done)return o;switch(n=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return u.label++,{value:i[1],done:!1};case 5:u.label++,n=i[1],i=[0];continue;case 7:i=u.ops.pop(),u.trys.pop();continue;default:if(!((o=(o=u.trys).length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){u.label=i[1];break}if(6===i[0]&&u.label<o[1]){u.label=o[1],o=i;break}if(o&&u.label<o[2]){u.label=o[2],u.ops.push(i);break}o[2]&&u.ops.pop(),u.trys.pop();continue}i=t.call(e,u)}catch(e){i=[6,e],n=0}finally{r=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}};Object.defineProperty(t,"__esModule",{value:!0}),t.D1QB=void 0;var c=r(501),s=r(40),a=function(e){function t(t){var r=e.call(this)||this;return r.db=t,r}return o(t,e),t.prototype.execute=function(e){return i(this,void 0,void 0,(function(){var t;return u(this,(function(r){return t=this.db.prepare(e.query),e.arguments&&(t=t.bind.apply(t,e.arguments)),e.fetchType===s.FetchTypes.ONE?[2,t.first()]:e.fetchType===s.FetchTypes.ALL?[2,t.all()]:[2,t.run()]}))}))},t}(c.QueryBuilder);t.D1QB=a},40:(e,t)=>{var r,n,o,i;Object.defineProperty(t,"__esModule",{value:!0}),t.JoinTypes=t.ConflictTypes=t.FetchTypes=t.OrderTypes=void 0,(i=t.OrderTypes||(t.OrderTypes={})).ASC="ASC",i.DESC="DESC",(o=t.FetchTypes||(t.FetchTypes={})).ONE="ONE",o.ALL="ALL",(n=t.ConflictTypes||(t.ConflictTypes={})).ROLLBACK="ROLLBACK",n.ABORT="ABORT",n.FAIL="FAIL",n.IGNORE="IGNORE",n.REPLACE="REPLACE",(r=t.JoinTypes||(t.JoinTypes={})).INNER="INNER",r.LEFT="LEFT",r.CROSS="CROSS"}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var i=t[n]={exports:{}};return e[n].call(i.exports,i,i.exports,r),i.exports}var n={};return(()=>{var e=n;Object.defineProperty(e,"__esModule",{value:!0}),e.FetchTypes=e.OrderTypes=e.D1QB=e.QueryBuilder=void 0;var t=r(501);Object.defineProperty(e,"QueryBuilder",{enumerable:!0,get:function(){return t.QueryBuilder}});var o=r(513);Object.defineProperty(e,"D1QB",{enumerable:!0,get:function(){return o.D1QB}});var i=r(40);Object.defineProperty(e,"OrderTypes",{enumerable:!0,get:function(){return i.OrderTypes}}),Object.defineProperty(e,"FetchTypes",{enumerable:!0,get:function(){return i.FetchTypes}})})(),n})()}));
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["workers-qb"]=t():e["workers-qb"]=t()}(this,(function(){return(()=>{"use strict";var e={501:function(e,t,n){var r=this&&this.__assign||function(){return r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e},r.apply(this,arguments)},o=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))((function(o,i){function u(e){try{s(r.next(e))}catch(e){i(e)}}function c(e){try{s(r.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?o(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(u,c)}s((r=r.apply(e,t||[])).next())}))},i=this&&this.__generator||function(e,t){var n,r,o,i,u={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;u;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return u.label++,{value:i[1],done:!1};case 5:u.label++,r=i[1],i=[0];continue;case 7:i=u.ops.pop(),u.trys.pop();continue;default:if(!((o=(o=u.trys).length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){u.label=i[1];break}if(6===i[0]&&u.label<o[1]){u.label=o[1],o=i;break}if(o&&u.label<o[2]){u.label=o[2],u.ops.push(i);break}o[2]&&u.ops.pop(),u.trys.pop();continue}i=t.call(e,u)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}};Object.defineProperty(t,"__esModule",{value:!0}),t.QueryBuilder=void 0;var u=n(40),c=n(235),s=function(){function e(){}return e.prototype.execute=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(e){throw new Error("Execute method not implemented")}))}))},e.prototype.createTable=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:"CREATE TABLE "+(e.ifNotExists?"IF NOT EXISTS":"")+" "+e.tableName+"\n              (\n                "+e.schema+"\n              )"})]}))}))},e.prototype.dropTable=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:"DROP TABLE "+(e.ifExists?"IF EXISTS":"")+" "+e.tableName})]}))}))},e.prototype.fetchOne=function(e){return o(this,void 0,void 0,(function(){var t;return i(this,(function(n){switch(n.label){case 0:return[4,this.execute({query:this._select(r(r({},e),{limit:1})),arguments:e.where?e.where.params:void 0,fetchType:u.FetchTypes.ALL})];case 1:return t=n.sent(),[2,r(r({},t),{results:t.results[0]})]}}))}))},e.prototype.fetchAll=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._select(e),arguments:e.where?e.where.params:void 0,fetchType:u.FetchTypes.ALL})]}))}))},e.prototype.insert=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._insert(e),arguments:Object.values(e.data),fetchType:u.FetchTypes.ALL})]}))}))},e.prototype.update=function(e){return o(this,void 0,void 0,(function(){var t;return i(this,(function(n){return t=Object.values(e.data),e.where&&e.where.params&&(t=e.where.params.concat(Object.values(e.data).map((function(e){return e instanceof c.Raw?e.content:e})))),[2,this.execute({query:this._update(e),arguments:t,fetchType:u.FetchTypes.ALL})]}))}))},e.prototype.delete=function(e){return o(this,void 0,void 0,(function(){return i(this,(function(t){return[2,this.execute({query:this._delete(e),arguments:e.where?e.where.params:void 0,fetchType:u.FetchTypes.ALL})]}))}))},e.prototype._onConflict=function(e){return e?"OR "+e+" ":""},e.prototype._insert=function(e){var t=Object.keys(e.data).join(", "),n=[];return Object.entries(e.data).forEach((function(e,t){e[0];var r=e[1];r instanceof c.Raw?n.push(r.content):n.push("?"+(t+1))})),"INSERT "+this._onConflict(e.onConflict)+"INTO "+e.tableName+" ("+t+") VALUES("+n.join(", ")+")"+this._returning(e.returning)},e.prototype._update=function(e){var t,n=e.where&&e.where.params?Object.keys(e.where.params).length:0,r=[];return Object.entries(e.data).forEach((function(e,t){var o=e[0],i=e[1];i instanceof c.Raw?r.push(o+" = "+i.content):r.push(o+" = ?"+(n+t+1))})),"UPDATE "+this._onConflict(e.onConflict)+e.tableName+" SET "+r.join(", ")+this._where(null===(t=e.where)||void 0===t?void 0:t.conditions)+this._returning(e.returning)},e.prototype._delete=function(e){var t;return"DELETE FROM "+e.tableName+this._where(null===(t=e.where)||void 0===t?void 0:t.conditions)+this._returning(e.returning)},e.prototype._select=function(e){var t;return"SELECT "+this._fields(e.fields)+" FROM "+e.tableName+this._join(e.join)+this._where(null===(t=e.where)||void 0===t?void 0:t.conditions)+this._groupBy(e.groupBy)+this._having(e.having)+this._orderBy(e.orderBy)+this._limit(e.limit)+this._offset(e.offset)},e.prototype._fields=function(e){return"string"==typeof e?e:e.join(", ")},e.prototype._where=function(e){return e?"string"==typeof e?" WHERE "+e:" WHERE "+e.join(" AND "):""},e.prototype._join=function(e){if(!e)return"";Array.isArray(e)||(e=[e]);var t=[];return e.forEach((function(e){var n=e.type?e.type+" ":"";t.push(n+"JOIN "+e.table+" ON "+e.on)}))," "+t.join(" ")},e.prototype._groupBy=function(e){return e?"string"==typeof e?" GROUP BY "+e:" GROUP BY "+e.join(", "):""},e.prototype._having=function(e){return e?" HAVING "+e:""},e.prototype._orderBy=function(e){if(!e)return"";if("string"==typeof e)return" ORDER BY "+e;if(Array.isArray(e))return" ORDER BY "+e.join(", ");var t=[];return Object.entries(e).forEach((function(e){var n=e[0],r=e[1];t.push(n+" "+r)}))," ORDER BY "+t.join(", ")},e.prototype._limit=function(e){return e?" LIMIT "+e:""},e.prototype._offset=function(e){return e?" OFFSET "+e:""},e.prototype._returning=function(e){return e?"string"==typeof e?" RETURNING "+e:" RETURNING "+e.join(", "):""},e}();t.QueryBuilder=s},513:function(e,t,n){var r,o=this&&this.__extends||(r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])},r(e,t)},function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),i=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))((function(o,i){function u(e){try{s(r.next(e))}catch(e){i(e)}}function c(e){try{s(r.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?o(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(u,c)}s((r=r.apply(e,t||[])).next())}))},u=this&&this.__generator||function(e,t){var n,r,o,i,u={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;u;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return u.label++,{value:i[1],done:!1};case 5:u.label++,r=i[1],i=[0];continue;case 7:i=u.ops.pop(),u.trys.pop();continue;default:if(!((o=(o=u.trys).length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){u.label=i[1];break}if(6===i[0]&&u.label<o[1]){u.label=o[1],o=i;break}if(o&&u.label<o[2]){u.label=o[2],u.ops.push(i);break}o[2]&&u.ops.pop(),u.trys.pop();continue}i=t.call(e,u)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}};Object.defineProperty(t,"__esModule",{value:!0}),t.D1QB=void 0;var c=n(501),s=n(40),a=n(235),f=function(e){function t(t){var n=e.call(this)||this;return n.db=t,n}return o(t,e),t.prototype.execute=function(e){return i(this,void 0,void 0,(function(){var t,n;return u(this,(function(r){return t=this.db.prepare(e.query),e.arguments&&(n=e.arguments.map((function(e){return e instanceof a.Raw?e.content:e})),t=t.bind.apply(t,n)),e.fetchType===s.FetchTypes.ONE?[2,t.first()]:e.fetchType===s.FetchTypes.ALL?[2,t.all()]:[2,t.run()]}))}))},t}(c.QueryBuilder);t.D1QB=f},40:(e,t)=>{var n,r,o,i;Object.defineProperty(t,"__esModule",{value:!0}),t.JoinTypes=t.ConflictTypes=t.FetchTypes=t.OrderTypes=void 0,(i=t.OrderTypes||(t.OrderTypes={})).ASC="ASC",i.DESC="DESC",(o=t.FetchTypes||(t.FetchTypes={})).ONE="ONE",o.ALL="ALL",(r=t.ConflictTypes||(t.ConflictTypes={})).ROLLBACK="ROLLBACK",r.ABORT="ABORT",r.FAIL="FAIL",r.IGNORE="IGNORE",r.REPLACE="REPLACE",(n=t.JoinTypes||(t.JoinTypes={})).INNER="INNER",n.LEFT="LEFT",n.CROSS="CROSS"},235:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.Raw=void 0;t.Raw=function(e){this.isRaw=!0,this.content=e}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r].call(i.exports,i,i.exports,n),i.exports}var r={};return(()=>{var e=r;Object.defineProperty(e,"__esModule",{value:!0}),e.FetchTypes=e.OrderTypes=e.D1QB=e.QueryBuilder=void 0;var t=n(501);Object.defineProperty(e,"QueryBuilder",{enumerable:!0,get:function(){return t.QueryBuilder}});var o=n(513);Object.defineProperty(e,"D1QB",{enumerable:!0,get:function(){return o.D1QB}});var i=n(40);Object.defineProperty(e,"OrderTypes",{enumerable:!0,get:function(){return i.OrderTypes}}),Object.defineProperty(e,"FetchTypes",{enumerable:!0,get:function(){return i.FetchTypes}})})(),r})()}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-qb",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Zero dependencies Query Builder for Cloudflare D1 Workers",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",