adminforth 1.3.54-next.9 → 1.3.55-next.2

package/dist/dataConnectors/mongo.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 dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
@@ -31,9 +22,9 @@ class MongoConnector extends AdminForthBaseConnector {
             [AdminForthSortDirections.desc]: -1,
         };
         this.db = new MongoClient(url);
-        (() => __awaiter(this, void 0, void 0, function* () {
+        (async () => {
             try {
-                yield this.db.connect();
+                await this.db.connect();
                 this.db.on('error', (err) => {
                     console.log('Mongo error: ', err.message);
                 });
@@ -42,24 +33,22 @@ class MongoConnector extends AdminForthBaseConnector {
             catch (e) {
                 console.error('ERROR: Failed to connect to Mongo', e);
             }
-        }))();
+        })();
     }
-    discoverFields(resource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return resource.columns.filter((col) => !col.virtual).reduce((acc, col) => {
-                if (!col.type) {
-                    throw new Error(`Type is not defined for column ${col.name} in resource ${resource.table}`);
-                }
-                acc[col.name] = {
-                    name: col.name,
-                    type: col.type,
-                    primaryKey: col.primaryKey,
-                    virtual: col.virtual,
-                    _underlineType: col._underlineType,
-                };
-                return acc;
-            }, {});
-        });
+    async discoverFields(resource) {
+        return resource.columns.filter((col) => !col.virtual).reduce((acc, col) => {
+            if (!col.type) {
+                throw new Error(`Type is not defined for column ${col.name} in resource ${resource.table}`);
+            }
+            acc[col.name] = {
+                name: col.name,
+                type: col.type,
+                primaryKey: col.primaryKey,
+                virtual: col.virtual,
+                _underlineType: col._underlineType,
+            };
+            return acc;
+        }, {});
     }
     getPrimaryKey(resource) {
         for (const col of resource.dataSourceColumns) {
@@ -108,87 +97,72 @@ class MongoConnector extends AdminForthBaseConnector {
         }
         return value;
     }
-    genQuery(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ filters }) {
-            const query = {};
-            for (const filter of filters) {
-                query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
-            }
-            return query;
-        });
+    async genQuery({ filters }) {
+        const query = {};
+        for (const filter of filters) {
+            query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
+        }
+        return query;
     }
-    getDataWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
-            // const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
-            const tableName = resource.table;
-            const collection = this.db.db().collection(tableName);
-            const query = yield this.genQuery({ filters });
-            const sortArray = sort.map((s) => {
-                return [s.field, this.SortDirectionsMap[s.direction]];
-            });
-            const result = yield collection.find(query)
-                .sort(sortArray)
-                .skip(offset)
-                .limit(limit)
-                .toArray();
-            return result;
+    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }) {
+        // const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
+        const tableName = resource.table;
+        const collection = this.db.db().collection(tableName);
+        const query = await this.genQuery({ filters });
+        const sortArray = sort.map((s) => {
+            return [s.field, this.SortDirectionsMap[s.direction]];
         });
+        const result = await collection.find(query)
+            .sort(sortArray)
+            .skip(offset)
+            .limit(limit)
+            .toArray();
+        return result;
     }
-    getCount(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, filters }) {
-            const collection = this.db.db().collection(resource.table);
-            const query = {};
-            for (const filter of filters) {
-                query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
-            }
-            return yield collection.countDocuments(query);
-        });
+    async getCount({ resource, filters }) {
+        const collection = this.db.db().collection(resource.table);
+        const query = {};
+        for (const filter of filters) {
+            query[filter.field] = this.OperatorsMap[filter.operator](filter.value);
+        }
+        return await collection.countDocuments(query);
     }
-    getMinMaxForColumnsWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, columns }) {
-            const tableName = resource.table;
-            const collection = this.db.db().collection(tableName);
-            const result = {};
-            for (const column of columns) {
-                result[column] = yield collection
-                    .aggregate([
-                    { $group: { _id: null, min: { $min: `$${column}` }, max: { $max: `$${column}` } } },
-                ])
-                    .toArray();
-            }
-            return result;
-        });
+    async getMinMaxForColumnsWithOriginalTypes({ resource, columns }) {
+        const tableName = resource.table;
+        const collection = this.db.db().collection(tableName);
+        const result = {};
+        for (const column of columns) {
+            result[column] = await collection
+                .aggregate([
+                { $group: { _id: null, min: { $min: `$${column}` }, max: { $max: `$${column}` } } },
+            ])
+                .toArray();
+        }
+        return result;
     }
-    createRecordOriginalValues(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, record }) {
-            const tableName = resource.table;
-            const collection = this.db.db().collection(tableName);
-            const columns = Object.keys(record);
-            const newRecord = {};
-            for (const colName of columns) {
-                newRecord[colName] = record[colName];
-            }
-            yield collection.insertOne(newRecord);
-        });
+    async createRecordOriginalValues({ resource, record }) {
+        const tableName = resource.table;
+        const collection = this.db.db().collection(tableName);
+        const columns = Object.keys(record);
+        const newRecord = {};
+        for (const colName of columns) {
+            newRecord[colName] = record[colName];
+        }
+        await collection.insertOne(newRecord);
     }
-    updateRecordOriginalValues(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId, newValues }) {
-            const collection = this.db.db().collection(resource.table);
-            yield collection.updateOne({ [this.getPrimaryKey(resource)]: recordId }, { $set: newValues });
-        });
+    async updateRecordOriginalValues({ resource, recordId, newValues }) {
+        const collection = this.db.db().collection(resource.table);
+        await collection.updateOne({ [this.getPrimaryKey(resource)]: recordId }, { $set: newValues });
     }
-    deleteRecord(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId }) {
-            const primaryKey = this.getPrimaryKey(resource);
-            const collection = this.db.db().collection(resource.table);
-            const res = yield collection.deleteOne({ [primaryKey]: recordId });
-            return res.deletedCount > 0;
-        });
+    async deleteRecord({ resource, recordId }) {
+        const primaryKey = this.getPrimaryKey(resource);
+        const collection = this.db.db().collection(resource.table);
+        const res = await collection.deleteOne({ [primaryKey]: recordId });
+        return res.deletedCount > 0;
     }
-    close() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.db.close();
-        });
+    async close() {
+        await this.db.close();
     }
 }
 export default MongoConnector;
+//# sourceMappingURL=mongo.js.map

package/dist/dataConnectors/mongo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mongo.js","sourceRoot":"","sources":["../../dataConnectors/mongo.ts"],"names":[],"mappings":"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"}

package/dist/dataConnectors/postgres.d.ts

@@ -0,0 +1,71 @@
+import { AdminForthResource, AdminForthFilterOperators, IAdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
+import AdminForthBaseConnector from './baseConnector.js';
+declare class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDataSourceConnector {
+    db: any;
+    constructor({ url }: {
+        url: any;
+    });
+    OperatorsMap: {
+        eq: string;
+        ne: string;
+        gt: string;
+        lt: string;
+        gte: string;
+        lte: string;
+        like: string;
+        ilike: string;
+        in: string;
+        nin: string;
+    };
+    SortDirectionsMap: {
+        asc: string;
+        desc: string;
+    };
+    discoverFields(resource: any): Promise<{}>;
+    getFieldValue(field: any, value: any): any;
+    setFieldValue(field: any, value: any): any;
+    whereClauseAndValues(resource: AdminForthResource, filters: {
+        field: string;
+        operator: AdminForthFilterOperators;
+        value: any;
+    }[]): {
+        sql: string;
+        paramsCount: number;
+        values: any[];
+    };
+    getDataWithOriginalTypes({ resource, limit, offset, sort, filters }: {
+        resource: any;
+        limit: any;
+        offset: any;
+        sort: any;
+        filters: any;
+    }): Promise<any[]>;
+    getCount({ resource, filters }: {
+        resource: AdminForthResource;
+        filters: {
+            field: string;
+            operator: AdminForthFilterOperators;
+            value: any;
+        }[];
+    }): Promise<number>;
+    getMinMaxForColumnsWithOriginalTypes({ resource, columns }: {
+        resource: any;
+        columns: any;
+    }): Promise<{}>;
+    createRecordOriginalValues({ resource, record }: {
+        resource: any;
+        record: any;
+    }): Promise<void>;
+    updateRecordOriginalValues({ resource, recordId, newValues }: {
+        resource: any;
+        recordId: any;
+        newValues: any;
+    }): Promise<void>;
+    deleteRecord({ resource, recordId }: {
+        resource: any;
+        recordId: any;
+    }): Promise<boolean>;
+    close(): Promise<void>;
+}
+export default PostgresConnector;
+//# sourceMappingURL=postgres.d.ts.map

package/dist/dataConnectors/postgres.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../dataConnectors/postgres.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,kBAAkB,EAAE,yBAAyB,EAA4B,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAC5K,OAAO,uBAAuB,MAAM,oBAAoB,CAAC;AAIzD,cAAM,iBAAkB,SAAQ,uBAAwB,YAAW,8BAA8B;IAE7F,EAAE,EAAE,GAAG,CAAC;gBAEI,EAAE,GAAG,EAAE;;KAAA;IAenB,YAAY;;;;;;;;;;;MAWV;IAEF,iBAAiB;;;MAGf;IAEI,cAAc,CAAC,QAAQ,KAAA;IAwF7B,aAAa,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA;IAyC1B,aAAa,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA;IAgB1B,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,yBAAyB,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,GAAI;QAClI,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,GAAG,EAAE,CAAC;KACf;IA6CK,wBAAwB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;;;;;;KAAA,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAwBpF,QAAQ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QAAE,QAAQ,EAAE,kBAAkB,CAAC;QAAC,OAAO,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,yBAAyB,CAAC;YAAC,KAAK,EAAE,GAAG,CAAA;SAAE,EAAE,CAAC;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAOlK,oCAAoC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;;;KAAA;IAa1D,0BAA0B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE;;;KAAA;IAW/C,0BAA0B,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAG,SAAS,EAAE;;;;KAAA;IAM7D,YAAY,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE;;;KAAA,GAAG,OAAO,CAAC,OAAO,CAAC;IAKtD,KAAK;CAGd;AAED,eAAe,iBAAiB,CAAC"}

package/dist/dataConnectors/postgres.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 dayjs from 'dayjs';
 import pkg from 'pg';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
@@ -34,19 +25,18 @@ class PostgresConnector extends AdminForthBaseConnector {
         this.db = new Client({
             connectionString: url
         });
-        (() => __awaiter(this, void 0, void 0, function* () {
-            yield this.db.connect();
+        (async () => {
+            await this.db.connect();
             this.db.on('error', (err) => {
                 console.log('Postgres error: ', err.message, err.stack);
                 this.db.end();
                 this.db = new PostgresConnector({ url }).db;
             });
-        }))();
+        })();
     }
-    discoverFields(resource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tableName = resource.table;
-            const stmt = yield this.db.query(`
+    async discoverFields(resource) {
+        const tableName = resource.table;
+        const stmt = await this.db.query(`
         SELECT
             a.attname AS name,
             pg_catalog.format_type(a.atttypid, a.atttypmod) AS type,
@@ -69,67 +59,66 @@ class PostgresConnector extends AdminForthBaseConnector {
         ORDER BY
             a.attnum;
     `, [tableName]);
-            const rows = stmt.rows;
-            const fieldTypes = {};
-            rows.forEach((row) => {
-                const field = {};
-                const baseType = row.type.toLowerCase();
-                if (baseType == 'int') {
-                    field.type = AdminForthDataTypes.INTEGER;
-                    field._underlineType = 'int';
-                }
-                else if (baseType.includes('float') || baseType.includes('double')) {
-                    field.type = AdminForthDataTypes.FLOAT;
-                    field._underlineType = 'float';
-                }
-                else if (baseType.includes('bool')) {
-                    field.type = AdminForthDataTypes.BOOLEAN;
-                    field._underlineType = 'bool';
-                }
-                else if (baseType == 'uuid') {
-                    field.type = AdminForthDataTypes.STRING;
-                    field._underlineType = 'uuid';
-                }
-                else if (baseType.includes('character varying')) {
-                    field.type = AdminForthDataTypes.STRING;
-                    field._underlineType = 'varchar';
-                    const length = baseType.match(/\d+/);
-                    field.maxLength = length ? parseInt(length[0]) : null;
-                }
-                else if (baseType == 'text') {
-                    field.type = AdminForthDataTypes.TEXT;
-                    field._underlineType = 'text';
-                }
-                else if (baseType.includes('decimal(')) {
-                    field.type = AdminForthDataTypes.DECIMAL;
-                    field._underlineType = 'decimal';
-                    const [precision, scale] = baseType.match(/\d+/g);
-                    field.precision = parseInt(precision);
-                    field.scale = parseInt(scale);
-                }
-                else if (baseType == 'real') {
-                    field.type = AdminForthDataTypes.FLOAT;
-                    field._underlineType = 'real';
-                }
-                else if (baseType == 'date') {
-                    field.type = AdminForthDataTypes.DATE;
-                    field._underlineType = 'timestamp';
-                }
-                else if (baseType.includes('date') || baseType.includes('time')) {
-                    field.type = AdminForthDataTypes.DATETIME;
-                    field._underlineType = 'timestamp';
-                }
-                else {
-                    field.type = 'unknown';
-                }
-                field._baseTypeDebug = baseType;
-                field.primaryKey = row.pk == 1;
-                field.default = row.dflt_value;
-                field.required = row.notnull && !row.dflt_value;
-                fieldTypes[row.name] = field;
-            });
-            return fieldTypes;
+        const rows = stmt.rows;
+        const fieldTypes = {};
+        rows.forEach((row) => {
+            const field = {};
+            const baseType = row.type.toLowerCase();
+            if (baseType == 'int') {
+                field.type = AdminForthDataTypes.INTEGER;
+                field._underlineType = 'int';
+            }
+            else if (baseType.includes('float') || baseType.includes('double')) {
+                field.type = AdminForthDataTypes.FLOAT;
+                field._underlineType = 'float';
+            }
+            else if (baseType.includes('bool')) {
+                field.type = AdminForthDataTypes.BOOLEAN;
+                field._underlineType = 'bool';
+            }
+            else if (baseType == 'uuid') {
+                field.type = AdminForthDataTypes.STRING;
+                field._underlineType = 'uuid';
+            }
+            else if (baseType.includes('character varying')) {
+                field.type = AdminForthDataTypes.STRING;
+                field._underlineType = 'varchar';
+                const length = baseType.match(/\d+/);
+                field.maxLength = length ? parseInt(length[0]) : null;
+            }
+            else if (baseType == 'text') {
+                field.type = AdminForthDataTypes.TEXT;
+                field._underlineType = 'text';
+            }
+            else if (baseType.includes('decimal(')) {
+                field.type = AdminForthDataTypes.DECIMAL;
+                field._underlineType = 'decimal';
+                const [precision, scale] = baseType.match(/\d+/g);
+                field.precision = parseInt(precision);
+                field.scale = parseInt(scale);
+            }
+            else if (baseType == 'real') {
+                field.type = AdminForthDataTypes.FLOAT;
+                field._underlineType = 'real';
+            }
+            else if (baseType == 'date') {
+                field.type = AdminForthDataTypes.DATE;
+                field._underlineType = 'timestamp';
+            }
+            else if (baseType.includes('date') || baseType.includes('time')) {
+                field.type = AdminForthDataTypes.DATETIME;
+                field._underlineType = 'timestamp';
+            }
+            else {
+                field.type = 'unknown';
+            }
+            field._baseTypeDebug = baseType;
+            field.primaryKey = row.pk == 1;
+            field.default = row.dflt_value;
+            field.required = row.notnull && !row.dflt_value;
+            fieldTypes[row.name] = field;
         });
+        return fieldTypes;
     }
     getFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
@@ -154,7 +143,12 @@ class PostgresConnector extends AdminForthBaseConnector {
         }
         if (field.type == AdminForthDataTypes.JSON) {
             if (typeof value == 'string') {
-                return JSON.parse(value);
+                try {
+                    return JSON.parse(value);
+                }
+                catch (e) {
+                    return { 'error': `Failed to parse JSON: ${e.message}` };
+                }
             }
             else if (typeof value == 'object') {
                 return value;
@@ -226,80 +220,67 @@ class PostgresConnector extends AdminForthBaseConnector {
             values: filterValues,
         };
     }
-    getDataWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, limit, offset, sort, filters }) {
-            const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
-            const tableName = resource.table;
-            const { sql: where, paramsCount, values: filterValues } = this.whereClauseAndValues(resource, filters);
-            const limitOffset = `LIMIT $${paramsCount} OFFSET $${paramsCount + 1}`;
-            const d = [...filterValues, limit, offset];
-            const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `"${s.field}" ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
-            const selectQuery = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} ${limitOffset}`;
-            if (process.env.HEAVY_DEBUG) {
-                console.log('🪲 PG selectQuery:', selectQuery, 'params:', d);
+    async getDataWithOriginalTypes({ resource, limit, offset, sort, filters }) {
+        const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
+        const tableName = resource.table;
+        const { sql: where, paramsCount, values: filterValues } = this.whereClauseAndValues(resource, filters);
+        const limitOffset = `LIMIT $${paramsCount} OFFSET $${paramsCount + 1}`;
+        const d = [...filterValues, limit, offset];
+        const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `"${s.field}" ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
+        const selectQuery = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} ${limitOffset}`;
+        if (process.env.HEAVY_DEBUG) {
+            console.log('🪲 PG selectQuery:', selectQuery, 'params:', d);
+        }
+        const stmt = await this.db.query(selectQuery, d);
+        const rows = stmt.rows;
+        return rows.map((row) => {
+            const newRow = {};
+            for (const [key, value] of Object.entries(row)) {
+                newRow[key] = value;
             }
-            const stmt = yield this.db.query(selectQuery, d);
-            const rows = stmt.rows;
-            return rows.map((row) => {
-                const newRow = {};
-                for (const [key, value] of Object.entries(row)) {
-                    newRow[key] = value;
-                }
-                return newRow;
-            });
+            return newRow;
         });
     }
-    getCount(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, filters }) {
-            const tableName = resource.table;
-            const { sql: where, values: filterValues } = this.whereClauseAndValues(resource, filters);
-            const stmt = yield this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues);
-            return stmt.rows[0].count;
-        });
+    async getCount({ resource, filters }) {
+        const tableName = resource.table;
+        const { sql: where, values: filterValues } = this.whereClauseAndValues(resource, filters);
+        const stmt = await this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues);
+        return stmt.rows[0].count;
     }
-    getMinMaxForColumnsWithOriginalTypes(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, columns }) {
-            const tableName = resource.table;
-            const result = {};
-            yield Promise.all(columns.map((col) => __awaiter(this, void 0, void 0, function* () {
-                const stmt = yield this.db.query(`SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`);
-                const { min, max } = stmt.rows[0];
-                result[col.name] = {
-                    min, max,
-                };
-            })));
-            return result;
-        });
+    async getMinMaxForColumnsWithOriginalTypes({ resource, columns }) {
+        const tableName = resource.table;
+        const result = {};
+        await Promise.all(columns.map(async (col) => {
+            const stmt = await this.db.query(`SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`);
+            const { min, max } = stmt.rows[0];
+            result[col.name] = {
+                min, max,
+            };
+        }));
+        return result;
     }
-    createRecordOriginalValues(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, record }) {
-            const tableName = resource.table;
-            const columns = Object.keys(record);
-            const placeholders = columns.map((_, i) => `$${i + 1}`).join(', ');
-            const values = columns.map((colName) => record[colName]);
-            for (let i = 0; i < columns.length; i++) {
-                columns[i] = `"${columns[i]}"`;
-            }
-            yield this.db.query(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`, values);
-        });
+    async createRecordOriginalValues({ resource, record }) {
+        const tableName = resource.table;
+        const columns = Object.keys(record);
+        const placeholders = columns.map((_, i) => `$${i + 1}`).join(', ');
+        const values = columns.map((colName) => record[colName]);
+        for (let i = 0; i < columns.length; i++) {
+            columns[i] = `"${columns[i]}"`;
+        }
+        await this.db.query(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`, values);
     }
-    updateRecordOriginalValues(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId, newValues }) {
-            const values = [...Object.values(newValues), recordId];
-            const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `"${col}" = $${i + 1}`).join(', ');
-            yield this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE "${this.getPrimaryKey(resource)}" = $${values.length}`, values);
-        });
+    async updateRecordOriginalValues({ resource, recordId, newValues }) {
+        const values = [...Object.values(newValues), recordId];
+        const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `"${col}" = $${i + 1}`).join(', ');
+        await this.db.query(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE "${this.getPrimaryKey(resource)}" = $${values.length}`, values);
     }
-    deleteRecord(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId }) {
-            const res = yield this.db.query(`DELETE FROM ${resource.table} WHERE "${this.getPrimaryKey(resource)}" = $1`, [recordId]);
-            return res.rowCount > 0;
-        });
+    async deleteRecord({ resource, recordId }) {
+        const res = await this.db.query(`DELETE FROM ${resource.table} WHERE "${this.getPrimaryKey(resource)}" = $1`, [recordId]);
+        return res.rowCount > 0;
     }
-    close() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.db.end();
-        });
+    async close() {
+        await this.db.end();
     }
 }
 export default PostgresConnector;
+//# sourceMappingURL=postgres.js.map