@iamkirbki/database-handler-core 4.4.3 → 4.4.5

package/dist/base/Query.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Container, Record } from '../index.js';
 import UnknownTableError from '../helpers/Errors/TableErrors/UnknownTableError.js';
 import UnexpectedEmptyQueryError from '../helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.js';
@@ -29,86 +20,72 @@ export default class Query {
         this._queryCache = QueryCache.getInstance();
         this._recordFactory = recordFactory;
     }
-    throwIfTableNotExists() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._queryCache.doesTableExist(this.TableName)) {
-                const exists = yield this.DoesTableExist();
-                if (!exists) {
-                    throw new UnknownTableError(this.TableName);
-                }
-                this._queryCache.addExistingTable(this.TableName);
+    async throwIfTableNotExists() {
+        if (!this._queryCache.doesTableExist(this.TableName)) {
+            const exists = await this.DoesTableExist();
+            if (!exists) {
+                throw new UnknownTableError(this.TableName);
             }
-        });
+            this._queryCache.addExistingTable(this.TableName);
+        }
     }
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
-    Run() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.throwIfTableNotExists();
-            if (!this._query) {
-                throw new UnexpectedEmptyQueryError();
-            }
-            const stmt = yield this._adapter.prepare(this._query);
-            return (yield stmt.run(this.Parameters));
-        });
+    async Run() {
+        await this.throwIfTableNotExists();
+        if (!this._query) {
+            throw new UnexpectedEmptyQueryError();
+        }
+        const stmt = await this._adapter.prepare(this._query);
+        return (await stmt.run(this.Parameters));
     }
     /** Execute a SELECT query and return all matching rows */
-    All() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.throwIfTableNotExists();
-            if (!this._query) {
-                throw new Error('No query defined to run.');
-            }
-            const stmt = yield this._adapter.prepare(this._query);
-            const results = (yield stmt.all(this.Parameters));
-            return results.map((res) => this._recordFactory(this.TableName, res));
-        });
+    async All() {
+        await this.throwIfTableNotExists();
+        if (!this._query) {
+            throw new Error('No query defined to run.');
+        }
+        const stmt = await this._adapter.prepare(this._query);
+        const results = (await stmt.all(this.Parameters));
+        return results.map((res) => this._recordFactory(this.TableName, res));
     }
     /** Execute a SELECT query and return the first matching row */
-    Get() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.throwIfTableNotExists();
-            if (!this._query) {
-                throw new Error('No query defined to run.');
-            }
-            const stmt = yield this._adapter.prepare(this._query);
-            const results = (yield stmt.get(this.Parameters));
-            return results
-                ? this._recordFactory(this.TableName, results)
-                : undefined;
-        });
+    async Get() {
+        await this.throwIfTableNotExists();
+        if (!this._query) {
+            throw new Error('No query defined to run.');
+        }
+        const stmt = await this._adapter.prepare(this._query);
+        const results = (await stmt.get(this.Parameters));
+        return results
+            ? this._recordFactory(this.TableName, results)
+            : undefined;
     }
-    TableColumnInformation(tableName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let tableColumnInfo = this._queryCache.getTableColumnInformation(tableName);
-            if (tableColumnInfo)
-                return tableColumnInfo;
-            tableColumnInfo = yield this._adapter.tableColumnInformation(tableName);
-            this._queryCache.setTableColumnInformation(tableName, tableColumnInfo);
+    async TableColumnInformation(tableName) {
+        let tableColumnInfo = this._queryCache.getTableColumnInformation(tableName);
+        if (tableColumnInfo)
             return tableColumnInfo;
-        });
+        tableColumnInfo = await this._adapter.tableColumnInformation(tableName);
+        this._queryCache.setTableColumnInformation(tableName, tableColumnInfo);
+        return tableColumnInfo;
     }
-    DoesTableExist() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._queryCache.doesTableExist(this.TableName)) {
-                return true;
-            }
-            const exists = yield this._adapter.tableExists(this.TableName);
-            if (exists) {
-                this._queryCache.addExistingTable(this.TableName);
-            }
-            return exists;
-        });
+    async DoesTableExist() {
+        if (this._queryCache.doesTableExist(this.TableName)) {
+            return true;
+        }
+        const exists = await this._adapter.tableExists(this.TableName);
+        if (exists) {
+            this._queryCache.addExistingTable(this.TableName);
+        }
+        return exists;
     }
-    Count() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.throwIfTableNotExists();
-            if (!this._query) {
-                throw new Error('No query defined to run.');
-            }
-            const stmt = yield this._adapter.prepare(this._query);
-            const result = (yield stmt.get(this.Parameters));
-            return parseInt(result.count) || 0;
-        });
+    async Count() {
+        await this.throwIfTableNotExists();
+        if (!this._query) {
+            throw new Error('No query defined to run.');
+        }
+        const stmt = await this._adapter.prepare(this._query);
+        const result = (await stmt.get(this.Parameters));
+        return parseInt(result.count) || 0;
     }
     ConvertParamsToArray(params) {
         const paramArray = [];
@@ -149,6 +126,6 @@ export default class Query {
                     : value,
             };
         })
-            .reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
+            .reduce((acc, curr) => ({ ...acc, ...curr }), {});
     }
 }

package/dist/base/Record.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { inspect } from "util";
 import Query from "./Query.js";
 import QueryStatementBuilder from "../helpers/QueryBuilders/QueryStatementBuilder.js";
@@ -26,94 +17,88 @@ export default class Record {
         return this._values;
     }
     ;
-    Insert() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const columns = Object.keys(this._values);
-            if (columns.length === 0) {
-                throw new Error("Cannot insert record with no columns");
-            }
-            const queryStr = yield oldQueryStatementBuilder.BuildInsert(this._tableName, this._values);
-            const query = this._queryFactory({
-                tableName: this._tableName,
-                query: queryStr,
-                parameters: this._values,
-                adapterName: this._customAdapter,
-                recordFactory: this._recordFactory
-            });
-            const result = yield query.Run();
-            let recordId;
-            // For PostgreSQL compatibility: use 'id' from values if lastInsertRowid is undefined
-            if (Array.isArray(this._values)) {
-                recordId = (_a = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _a !== void 0 ? _a : this._values.map(v => v.column === 'id' ? v.value : undefined);
-            }
-            else {
-                recordId = (_b = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _b !== void 0 ? _b : this._values.id;
-            }
-            if (recordId === undefined) {
-                return undefined;
-            }
-            const builder = new QueryStatementBuilder({ base: { from: this._tableName, where: Object.assign({}, this._values) } });
-            const queryStrSelect = yield builder.build();
-            const querySelect = this._queryFactory({
-                tableName: this._tableName,
-                query: queryStrSelect,
-                parameters: this._values,
-                adapterName: this._customAdapter,
-                recordFactory: this._recordFactory
-            });
-            const insertedRecord = yield querySelect.All();
-            if (insertedRecord.length > 0) {
-                this._values = insertedRecord[insertedRecord.length - 1].values;
-            }
-            this._values = Object.assign(Object.assign({}, this._values), { id: recordId });
-            return this;
+    async Insert() {
+        var _a, _b;
+        const columns = Object.keys(this._values);
+        if (columns.length === 0) {
+            throw new Error("Cannot insert record with no columns");
+        }
+        const queryStr = await oldQueryStatementBuilder.BuildInsert(this._tableName, this._values);
+        const query = this._queryFactory({
+            tableName: this._tableName,
+            query: queryStr,
+            parameters: this._values,
+            adapterName: this._customAdapter,
+            recordFactory: this._recordFactory
         });
+        const result = await query.Run();
+        let recordId;
+        // For PostgreSQL compatibility: use 'id' from values if lastInsertRowid is undefined
+        if (Array.isArray(this._values)) {
+            recordId = (_a = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _a !== void 0 ? _a : this._values.map(v => v.column === 'id' ? v.value : undefined);
+        }
+        else {
+            recordId = (_b = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _b !== void 0 ? _b : this._values.id;
+        }
+        if (recordId === undefined) {
+            return undefined;
+        }
+        const builder = new QueryStatementBuilder({ base: { from: this._tableName, where: { ...this._values } } });
+        const queryStrSelect = await builder.build();
+        const querySelect = this._queryFactory({
+            tableName: this._tableName,
+            query: queryStrSelect,
+            parameters: this._values,
+            adapterName: this._customAdapter,
+            recordFactory: this._recordFactory
+        });
+        const insertedRecord = await querySelect.All();
+        if (insertedRecord.length > 0) {
+            this._values = insertedRecord[insertedRecord.length - 1].values;
+        }
+        this._values = { ...this._values, id: recordId };
+        return this;
     }
     /** Update this record in the database */
-    Update(newValues, whereParameters) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const originalValues = this._values;
-            if (originalValues.updated_at !== undefined) {
-                newValues.updated_at = new Date().toISOString();
-            }
-            const queryStr = yield oldQueryStatementBuilder.BuildUpdate(this._tableName, newValues, whereParameters);
-            // Merge newValues and originalValues for parameters (with 'where_' prefix for where clause)
-            const params = Object.assign({}, newValues);
-            Object.entries(originalValues).forEach(([key, value]) => {
-                params[`where_${key}`] = value;
-            });
-            const _query = this._queryFactory({
-                tableName: this._tableName,
-                query: queryStr,
-                parameters: params,
-                adapterName: this._customAdapter,
-                recordFactory: this._recordFactory
-            });
-            yield _query.Run();
-            this._values = Object.assign(Object.assign({}, this._values), newValues);
-            return this;
+    async Update(newValues, whereParameters) {
+        const originalValues = this._values;
+        if (originalValues.updated_at !== undefined) {
+            newValues.updated_at = new Date().toISOString();
+        }
+        const queryStr = await oldQueryStatementBuilder.BuildUpdate(this._tableName, newValues, whereParameters);
+        // Merge newValues and originalValues for parameters (with 'where_' prefix for where clause)
+        const params = { ...newValues };
+        Object.entries(originalValues).forEach(([key, value]) => {
+            params[`where_${key}`] = value;
+        });
+        const _query = this._queryFactory({
+            tableName: this._tableName,
+            query: queryStr,
+            parameters: params,
+            adapterName: this._customAdapter,
+            recordFactory: this._recordFactory
         });
+        await _query.Run();
+        this._values = { ...this._values, ...newValues };
+        return this;
     }
     /** Delete this record from the database */
-    Delete(primaryKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const originalValues = this._values;
-            if (originalValues.deleted_at !== undefined) {
-                this._values.deleted_at = new Date().toISOString();
-                yield this.Update(this._values, this._values.id ? { id: this._values.id } : primaryKey || {});
-                return;
-            }
-            const queryStr = yield oldQueryStatementBuilder.BuildDelete(this._tableName, this._values);
-            const _query = this._queryFactory({
-                tableName: this._tableName,
-                query: queryStr,
-                parameters: this.values,
-                adapterName: this._customAdapter,
-                recordFactory: this._recordFactory
-            });
-            yield _query.Run();
+    async Delete(primaryKey) {
+        const originalValues = this._values;
+        if (originalValues.deleted_at !== undefined) {
+            this._values.deleted_at = new Date().toISOString();
+            await this.Update(this._values, this._values.id ? { id: this._values.id } : primaryKey || {});
+            return;
+        }
+        const queryStr = await oldQueryStatementBuilder.BuildDelete(this._tableName, this._values);
+        const _query = this._queryFactory({
+            tableName: this._tableName,
+            query: queryStr,
+            parameters: this.values,
+            adapterName: this._customAdapter,
+            recordFactory: this._recordFactory
         });
+        await _query.Run();
     }
     /** Returns the values object for JSON.stringify() */
     toJSON() {

package/dist/base/Table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,uBAAuB,EACvB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,aAAa,EACb,WAAW,EACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE/C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,+CAA+C;gBAE3C,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,GAAE,YAA4C,EAC1D,aAAa,GAAE,aAA8E;IAcjG,IAAW,iBAAiB,IAAI,KAAK,CAEpC;IAED,iCAAiC;IACpB,sBAAsB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAInF,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAqB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAYpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAUvC,qCAAqC;IACxB,MAAM,CAAC,IAAI,SAAS,UAAU,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAM7F,gDAAgD;IACnC,IAAI,CAAC,IAAI,SAAS,UAAU,EACrC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAsCZ,eAAe;IAkChB,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CAoBhE"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,uBAAuB,EACvB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,aAAa,EACb,WAAW,EAEd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE/C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,+CAA+C;gBAE3C,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,GAAE,YAA4C,EAC1D,aAAa,GAAE,aAA8E;IAcjG,IAAW,iBAAiB,IAAI,KAAK,CAEpC;IAED,iCAAiC;IACpB,sBAAsB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAInF,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAqB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAYpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAUvC,qCAAqC;IACxB,MAAM,CAAC,IAAI,SAAS,UAAU,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAM7F,gDAAgD;IACnC,IAAI,CAAC,IAAI,SAAS,UAAU,EACrC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAsCZ,eAAe;IAoChB,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CAoBhE"}