adminforth 1.1.73 → 1.1.75

package/dist/dataConnectors/mongo.js

@@ -84,7 +84,7 @@ class MongoConnector {
         }
         return value;
     }
-    getRecordByPrimaryKey(resource, key) {
+    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
         return __awaiter(this, void 0, void 0, function* () {
             const tableName = resource.table;
             const collection = this.db.db().collection(tableName);
@@ -99,7 +99,7 @@ class MongoConnector {
                     continue; // should I continue or throw an error?
                     throw new Error(`Resource '${resource.table}' has no column '${key_1}' defined`);
                 }
-                newRow[key_1] = this.getFieldValue(dbKey, value);
+                newRow[key_1] = value;
             }
             console.log('newRow', newRow);
             return newRow;
@@ -124,7 +124,7 @@ class MongoConnector {
         }
         return value;
     }
-    getData(_a) {
+    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;
@@ -142,7 +142,7 @@ class MongoConnector {
             return { data: result, total };
         });
     }
-    getMinMaxForColumns(_a) {
+    getMinMaxForColumnsWithOriginalTypes(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, columns }) {
             const tableName = resource.table;
             const collection = this.db.db().collection(tableName);
@@ -164,19 +164,13 @@ class MongoConnector {
             const columns = Object.keys(record);
             const newRecord = {};
             for (const colName of columns) {
-                const col = resource.dataSourceColumns.find((col) => col.name == colName);
-                if (col) {
-                    newRecord[colName] = this.setFieldValue(col, record[colName]);
-                }
-                else {
-                    newRecord[colName] = record[colName];
-                }
+                newRecord[colName] = record[colName];
             }
             yield collection.insertOne(newRecord);
         });
     }
     updateRecord(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId, record, newValues }) {
+        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 });
         });

package/dist/dataConnectors/postgres.js

@@ -10,9 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import dayjs from 'dayjs';
 import pkg from 'pg';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import AdminForthBaseConnector from './baseConnector.js';
 const { Client } = pkg;
-class PostgresConnector {
+class PostgresConnector extends AdminForthBaseConnector {
     constructor({ url }) {
+        super();
         this.OperatorsMap = {
             [AdminForthFilterOperators.EQ]: '=',
             [AdminForthFilterOperators.NE]: '!=',
@@ -152,14 +154,7 @@ class PostgresConnector {
         }
         return value;
     }
-    getPrimaryKey(resource) {
-        for (const col of resource.dataSourceColumns) {
-            if (col.primaryKey) {
-                return col.name;
-            }
-        }
-    }
-    getRecordByPrimaryKey(resource, key) {
+    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
         return __awaiter(this, void 0, void 0, function* () {
             const tableName = resource.table;
             const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
@@ -170,7 +165,7 @@ class PostgresConnector {
             }
             const newRow = {};
             for (const [key_1, value] of Object.entries(row)) {
-                newRow[key_1] = this.getFieldValue(resource.dataSourceColumns.find((col_1) => col_1.name == key_1), value);
+                newRow[key_1] = value;
             }
             return newRow;
         });
@@ -192,7 +187,7 @@ class PostgresConnector {
         }
         return value;
     }
-    getData(_a) {
+    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;
@@ -220,13 +215,7 @@ class PostgresConnector {
             const filterValues = [];
             filters.length ? filters.forEach((f) => {
                 // for arrays do set in map
-                let v;
-                if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
-                    v = f.value.map((val) => this.setFieldValue(resource.dataSourceColumns.find((col) => col.name == f.field), val));
-                }
-                else {
-                    v = this.setFieldValue(resource.dataSourceColumns.find((col) => col.name == f.field), f.value);
-                }
+                let v = f.value;
                 if (f.operator == AdminForthFilterOperators.LIKE || f.operator == AdminForthFilterOperators.ILIKE) {
                     filterValues.push(`%${v}%`);
                 }
@@ -247,12 +236,11 @@ class PostgresConnector {
             const stmt = yield this.db.query(selectQuery, d);
             const rows = stmt.rows;
             const total = (yield this.db.query(`SELECT COUNT(*) FROM ${tableName} ${where}`, filterValues)).rows[0].count;
-            // run all fields via getFieldValue
             return {
                 data: rows.map((row) => {
                     const newRow = {};
                     for (const [key, value] of Object.entries(row)) {
-                        newRow[key] = this.getFieldValue(resource.dataSourceColumns.find((col) => col.name == key), value);
+                        newRow[key] = value;
                     }
                     return newRow;
                 }),
@@ -260,7 +248,7 @@ class PostgresConnector {
             };
         });
     }
-    getMinMaxForColumns(_a) {
+    getMinMaxForColumnsWithOriginalTypes(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, columns }) {
             const tableName = resource.table;
             const result = {};
@@ -268,8 +256,7 @@ class PostgresConnector {
                 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: this.getFieldValue(col, min),
-                    max: this.getFieldValue(col, max),
+                    min, max,
                 };
             })));
             return result;
@@ -280,15 +267,7 @@ class PostgresConnector {
             const tableName = resource.table;
             const columns = Object.keys(record);
             const placeholders = columns.map((_, i) => `$${i + 1}`).join(', ');
-            const values = columns.map((colName) => {
-                const col = resource.dataSourceColumns.find((col) => col.name == colName);
-                if (col) {
-                    return this.setFieldValue(col, record[colName]);
-                }
-                else {
-                    return record[colName];
-                }
-            });
+            const values = columns.map((colName) => record[colName]);
             for (let i = 0; i < columns.length; i++) {
                 columns[i] = `"${columns[i]}"`;
             }
@@ -296,7 +275,7 @@ class PostgresConnector {
         });
     }
     updateRecord(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId, record, newValues }) {
+        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);

package/dist/dataConnectors/sqlite.js

@@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import betterSqlite3 from 'better-sqlite3';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import AdminForthBaseConnector from './baseConnector.js';
 import dayjs from 'dayjs';
-class SQLiteConnector {
+class SQLiteConnector extends AdminForthBaseConnector {
     constructor({ url }) {
-        // create connection here
+        super();
         this.OperatorsMap = {
             [AdminForthFilterOperators.EQ]: '=',
             [AdminForthFilterOperators.NE]: '!=',
@@ -29,6 +30,7 @@ class SQLiteConnector {
             [AdminForthSortDirections.asc]: 'ASC',
             [AdminForthSortDirections.desc]: 'DESC',
         };
+        // create connection here
         this.db = betterSqlite3(url.replace('sqlite://', ''));
     }
     discoverFields(resource) {
@@ -85,13 +87,6 @@ class SQLiteConnector {
             return fieldTypes;
         });
     }
-    getPrimaryKey(resource) {
-        for (const col of resource.dataSourceColumns) {
-            if (col.primaryKey) {
-                return col.name;
-            }
-        }
-    }
     getFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
@@ -118,7 +113,7 @@ class SQLiteConnector {
         }
         return value;
     }
-    getRecordByPrimaryKey(resource, key) {
+    getRecordByPrimaryKeyWithOriginalTypes(resource, key) {
         return __awaiter(this, void 0, void 0, function* () {
             const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
             const tableName = resource.table;
@@ -129,7 +124,7 @@ class SQLiteConnector {
             }
             const newRow = {};
             for (const [key, value] of Object.entries(row)) {
-                newRow[key] = this.getFieldValue(resource.dataSourceColumns.find((col) => col.name == key), value);
+                newRow[key] = value;
             }
             return newRow;
         });
@@ -153,65 +148,60 @@ class SQLiteConnector {
         }
         return value;
     }
-    getData({ resource, limit, offset, sort, filters }) {
-        const columns = resource.dataSourceColumns.map((col) => col.name).join(', ');
-        const tableName = resource.table;
-        const where = filters.length ? `WHERE ${filters.map((f, i) => {
-            let placeholder = '?';
-            let field = f.field;
-            let operator = this.OperatorsMap[f.operator];
-            if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
-                placeholder = `(${f.value.map(() => '?').join(', ')})`;
-            }
-            else if (f.operator == AdminForthFilterOperators.ILIKE) {
-                placeholder = `LOWER(?)`;
-                field = `LOWER(${f.field})`;
-                operator = 'LIKE';
-            }
-            return `${field} ${operator} ${placeholder}`;
-        }).join(' AND ')}` : '';
-        const filterValues = [];
-        filters.length ? filters.forEach((f) => {
-            // for arrays do set in map
-            let v;
-            if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
-                v = f.value.map((val) => this.setFieldValue(resource.dataSourceColumns.find((col) => col.name == f.field), val));
-            }
-            else {
-                v = this.setFieldValue(resource.dataSourceColumns.find((col) => col.name == f.field), f.value);
-            }
-            if (f.operator == AdminForthFilterOperators.LIKE || f.operator == AdminForthFilterOperators.ILIKE) {
-                filterValues.push(`%${v}%`);
-            }
-            else if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
-                filterValues.push(...v);
-            }
-            else {
-                filterValues.push(v);
-            }
-        }) : [];
-        const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `${s.field} ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
-        const q = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} LIMIT ? OFFSET ?`;
-        const stmt = this.db.prepare(q);
-        const d = [...filterValues, limit, offset];
-        if (process.env.HEAVY_DEBUG) {
-            console.log('🪲 SQLITE Query', q, 'params:', d);
-        }
-        const rows = stmt.all(d);
-        const total = this.db.prepare(`SELECT COUNT(*) FROM ${tableName} ${where}`).get([...filterValues])['COUNT(*)'];
-        // run all fields via getFieldValue
-        return {
-            data: rows.map((row) => {
-                const newRow = {};
-                for (const [key, value] of Object.entries(row)) {
-                    newRow[key] = this.getFieldValue(resource.dataSourceColumns.find((col) => col.name == key), value);
+    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 where = filters.length ? `WHERE ${filters.map((f, i) => {
+                let placeholder = '?';
+                let field = f.field;
+                let operator = this.OperatorsMap[f.operator];
+                if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
+                    placeholder = `(${f.value.map(() => '?').join(', ')})`;
                 }
-                return newRow;
-            }),
-            total,
-        };
+                else if (f.operator == AdminForthFilterOperators.ILIKE) {
+                    placeholder = `LOWER(?)`;
+                    field = `LOWER(${f.field})`;
+                    operator = 'LIKE';
+                }
+                return `${field} ${operator} ${placeholder}`;
+            }).join(' AND ')}` : '';
+            const filterValues = [];
+            filters.length ? filters.forEach((f) => {
+                // for arrays do set in map
+                const v = f.value;
+                if (f.operator == AdminForthFilterOperators.LIKE || f.operator == AdminForthFilterOperators.ILIKE) {
+                    filterValues.push(`%${v}%`);
+                }
+                else if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
+                    filterValues.push(...v);
+                }
+                else {
+                    filterValues.push(v);
+                }
+            }) : [];
+            const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `${s.field} ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
+            const q = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} LIMIT ? OFFSET ?`;
+            const stmt = this.db.prepare(q);
+            const d = [...filterValues, limit, offset];
+            if (process.env.HEAVY_DEBUG) {
+                console.log('🪲 SQLITE Query', q, 'params:', d);
+            }
+            const rows = yield stmt.all(d);
+            const total = (yield this.db.prepare(`SELECT COUNT(*) FROM ${tableName} ${where}`).get([...filterValues]))['COUNT(*)'];
+            return {
+                data: rows.map((row) => {
+                    const newRow = {};
+                    for (const [key, value] of Object.entries(row)) {
+                        newRow[key] = value;
+                    }
+                    return newRow;
+                }),
+                total,
+            };
+        });
     }
-    getMinMaxForColumns(_a) {
+    getMinMaxForColumnsWithOriginalTypes(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, columns }) {
             const tableName = resource.table;
             const result = {};
@@ -219,8 +209,7 @@ class SQLiteConnector {
                 const stmt = yield this.db.prepare(`SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`);
                 const { min, max } = stmt.get();
                 result[col.name] = {
-                    min: this.getFieldValue(col, min),
-                    max: this.getFieldValue(col, max),
+                    min, max,
                 };
             })));
             return result;
@@ -231,28 +220,23 @@ class SQLiteConnector {
             const tableName = resource.table;
             const columns = Object.keys(record);
             const placeholders = columns.map(() => '?').join(', ');
-            const values = columns.map((colName) => {
-                const col = resource.dataSourceColumns.find((col) => col.name == colName);
-                if (col) {
-                    return this.setFieldValue(col, record[colName]);
-                }
-                else {
-                    return record[colName];
-                }
-            });
-            this.db.prepare(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`).run(values);
+            const values = columns.map((colName) => record[colName]);
+            const q = this.db.prepare(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`);
+            yield q.run(values);
         });
     }
     updateRecord(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ resource, recordId, record, newValues }) {
+        return __awaiter(this, arguments, void 0, function* ({ resource, recordId, newValues }) {
             const columnsWithPlaceholders = Object.keys(newValues).map((col) => `${col} = ?`);
             const values = [...Object.values(newValues), recordId];
-            this.db.prepare(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = ?`).run(values);
+            const q = this.db.prepare(`UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = ?`);
+            yield q.run(values);
         });
     }
     deleteRecord(_a) {
         return __awaiter(this, arguments, void 0, function* ({ resource, recordId }) {
-            this.db.prepare(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = ?`).run(recordId);
+            const q = this.db.prepare(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = ?`);
+            yield q.run(recordId);
         });
     }
     close() {