adminforth 1.0.73 → 1.0.74

package/dataConnectors/mongo.ts

@@ -1,7 +1,6 @@
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
-import { AdminForthFilterOperators, AdminForthSortDirections, AdminForthTypes } from '../types.js';
-
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
 
 class MongoConnector {
     db: MongoClient
@@ -65,7 +64,7 @@ class MongoConnector {
     }
 
     getFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
           if (!value) {
             return null;
           }
@@ -76,7 +75,7 @@ class MongoConnector {
           } else {
             throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
           }
-        } else if (field.type == AdminForthTypes.BOOLEAN) {
+        } else if (field.type == AdminForthDataTypes.BOOLEAN) {
           return !!value;
         }
         return value;
@@ -103,7 +102,7 @@ class MongoConnector {
     }
 
     setFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
           if (!value) {
             return null;
           }
@@ -114,7 +113,7 @@ class MongoConnector {
             // value is iso string now, convert to unix timestamp
             return dayjs(value).toISOString();
           }
-        } else if (field.type == AdminForthTypes.BOOLEAN) {
+        } else if (field.type == AdminForthDataTypes.BOOLEAN) {
           return value ? 1 : 0;
         }
         return value;

package/dataConnectors/postgres.ts

@@ -1,6 +1,7 @@
 import dayjs from 'dayjs';
 import pkg from 'pg';
-import { AdminForthFilterOperators, AdminForthSortDirections, AdminForthTypes } from '../types.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+
 const { Client } = pkg;
 
 
@@ -72,44 +73,44 @@ class PostgresConnector {
             const field: any = {};
             const baseType = row.type.toLowerCase();
             if (baseType == 'int') {
-                field.type = AdminForthTypes.INTEGER;
+                field.type = AdminForthDataTypes.INTEGER;
                 field._underlineType = 'int';
 
             } else if (baseType.includes('float') || baseType.includes('double')) {
-                field.type = AdminForthTypes.FLOAT;
+                field.type = AdminForthDataTypes.FLOAT;
                 field._underlineType = 'float';
 
             } else if (baseType.includes('bool')) {
-                field.type = AdminForthTypes.BOOLEAN;
+                field.type = AdminForthDataTypes.BOOLEAN;
                 field._underlineType = 'bool';
 
             } else if (baseType == 'uuid') {
-                field.type = AdminForthTypes.STRING;
+                field.type = AdminForthDataTypes.STRING;
                 field._underlineType = 'uuid';
 
             } else if (baseType.includes('character varying')) {
-                field.type = AdminForthTypes.STRING;
+                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 = AdminForthTypes.TEXT;
+                field.type = AdminForthDataTypes.TEXT;
                 field._underlineType = 'text';
 
             } else if (baseType.includes('decimal(')) {
-                field.type = AdminForthTypes.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 = AdminForthTypes.FLOAT;
+                field.type = AdminForthDataTypes.FLOAT;
                 field._underlineType = 'real';
 
             } else if (baseType.includes('date') || baseType.includes('time')) {
-                field.type = AdminForthTypes.DATETIME;
+                field.type = AdminForthDataTypes.DATETIME;
                 field._underlineType = 'timestamp';
 
             } else {
@@ -125,7 +126,7 @@ class PostgresConnector {
     }
 
     getFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
           if (!value) {
             return null;
           }
@@ -165,7 +166,7 @@ class PostgresConnector {
     }
 
     setFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
           if (!value) {
             return null;
           }
@@ -174,14 +175,14 @@ class PostgresConnector {
           } else if (field._underlineType == 'varchar') {
             return dayjs(value).toISOString();
           }
-        } else if (field.type == AdminForthTypes.BOOLEAN) {
+        } else if (field.type == AdminForthDataTypes.BOOLEAN) {
           return value ? 1 : 0;
         }
         return value;
       }
     
     async getData({ resource, limit, offset, sort, filters }) {
-      const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => `"${col.name}"`).join(', ');
+      const columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
       const tableName = resource.table;
       
       let totalCounter = 1;
@@ -229,7 +230,7 @@ class PostgresConnector {
       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);
+        console.log('🪲 PG selectQuery:', selectQuery, 'params:', d);
       }
       const stmt = await this.db.query(selectQuery, d);
       const rows = stmt.rows;

package/dataConnectors/sqlite.ts

@@ -1,5 +1,6 @@
 import betterSqlite3 from 'better-sqlite3';
-import { AdminForthTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+
 import dayjs from 'dayjs';
 
 class SQLiteConnector {
@@ -21,30 +22,30 @@ class SQLiteConnector {
           const field: any = {};
           const baseType = row.type.toLowerCase();
           if (baseType == 'int') {
-            field.type = AdminForthTypes.INTEGER;
+            field.type = AdminForthDataTypes.INTEGER;
             field._underlineType = 'int';
           } else if (baseType.includes('varchar(')) {
-            field.type = AdminForthTypes.STRING;
+            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 = AdminForthTypes.TEXT;
+            field.type = AdminForthDataTypes.TEXT;
             field._underlineType = 'text';
           } else if (baseType.includes('decimal(')) {
-            field.type = AdminForthTypes.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 = AdminForthTypes.FLOAT; //8-byte IEEE floating point number. It
+            field.type = AdminForthDataTypes.FLOAT; //8-byte IEEE floating point number. It
             field._underlineType = 'real';
           } else if (baseType == 'timestamp') {
-            field.type = AdminForthTypes.DATETIME;
+            field.type = AdminForthDataTypes.DATETIME;
             field._underlineType = 'timestamp';
           } else if (baseType == 'boolean') {
-            field.type = AdminForthTypes.BOOLEAN;
+            field.type = AdminForthDataTypes.BOOLEAN;
             field._underlineType = 'boolean';
           } else {
             field.type = 'unknown'
@@ -67,7 +68,7 @@ class SQLiteConnector {
     }
 
     getFieldValue(field, value) {
-      if (field.type == AdminForthTypes.DATETIME) {
+      if (field.type == AdminForthDataTypes.DATETIME) {
         if (!value) {
           return null;
         }
@@ -78,7 +79,7 @@ class SQLiteConnector {
         } else {
           throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps). Issue in field "${field.name}"`);
         }
-      } else if (field.type == AdminForthTypes.BOOLEAN) {
+      } else if (field.type == AdminForthDataTypes.BOOLEAN) {
         return !!value;
       }
       return value;
@@ -100,7 +101,7 @@ class SQLiteConnector {
     }
 
     setFieldValue(field, value) {
-      if (field.type == AdminForthTypes.DATETIME) {
+      if (field.type == AdminForthDataTypes.DATETIME) {
         if (!value) {
           return null;
         }
@@ -111,7 +112,7 @@ class SQLiteConnector {
           // value is iso string now, convert to unix timestamp
           return dayjs(value).toISOString();
         }
-      } else if (field.type == AdminForthTypes.BOOLEAN) {
+      } else if (field.type == AdminForthDataTypes.BOOLEAN) {
         return value ? 1 : 0;
       }
 
@@ -183,6 +184,10 @@ class SQLiteConnector {
       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(*)'];

package/dist/dataConnectors/mongo.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
-import { AdminForthFilterOperators, AdminForthSortDirections, AdminForthTypes } from '../types.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
 class MongoConnector {
     constructor({ url }) {
         this.OperatorsMap = {
@@ -67,7 +67,7 @@ class MongoConnector {
         }
     }
     getFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
                 return null;
             }
@@ -81,7 +81,7 @@ class MongoConnector {
                 throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
             }
         }
-        else if (field.type == AdminForthTypes.BOOLEAN) {
+        else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return !!value;
         }
         return value;
@@ -108,7 +108,7 @@ class MongoConnector {
         });
     }
     setFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
                 return null;
             }
@@ -121,7 +121,7 @@ class MongoConnector {
                 return dayjs(value).toISOString();
             }
         }
-        else if (field.type == AdminForthTypes.BOOLEAN) {
+        else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return value ? 1 : 0;
         }
         return value;

package/dist/dataConnectors/postgres.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import dayjs from 'dayjs';
 import pkg from 'pg';
-import { AdminForthFilterOperators, AdminForthSortDirections, AdminForthTypes } from '../types.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
 const { Client } = pkg;
 class PostgresConnector {
     constructor({ url }) {
@@ -73,44 +73,44 @@ class PostgresConnector {
                 const field = {};
                 const baseType = row.type.toLowerCase();
                 if (baseType == 'int') {
-                    field.type = AdminForthTypes.INTEGER;
+                    field.type = AdminForthDataTypes.INTEGER;
                     field._underlineType = 'int';
                 }
                 else if (baseType.includes('float') || baseType.includes('double')) {
-                    field.type = AdminForthTypes.FLOAT;
+                    field.type = AdminForthDataTypes.FLOAT;
                     field._underlineType = 'float';
                 }
                 else if (baseType.includes('bool')) {
-                    field.type = AdminForthTypes.BOOLEAN;
+                    field.type = AdminForthDataTypes.BOOLEAN;
                     field._underlineType = 'bool';
                 }
                 else if (baseType == 'uuid') {
-                    field.type = AdminForthTypes.STRING;
+                    field.type = AdminForthDataTypes.STRING;
                     field._underlineType = 'uuid';
                 }
                 else if (baseType.includes('character varying')) {
-                    field.type = AdminForthTypes.STRING;
+                    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 = AdminForthTypes.TEXT;
+                    field.type = AdminForthDataTypes.TEXT;
                     field._underlineType = 'text';
                 }
                 else if (baseType.includes('decimal(')) {
-                    field.type = AdminForthTypes.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 = AdminForthTypes.FLOAT;
+                    field.type = AdminForthDataTypes.FLOAT;
                     field._underlineType = 'real';
                 }
                 else if (baseType.includes('date') || baseType.includes('time')) {
-                    field.type = AdminForthTypes.DATETIME;
+                    field.type = AdminForthDataTypes.DATETIME;
                     field._underlineType = 'timestamp';
                 }
                 else {
@@ -126,7 +126,7 @@ class PostgresConnector {
         });
     }
     getFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
                 return null;
             }
@@ -166,7 +166,7 @@ class PostgresConnector {
         });
     }
     setFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
                 return null;
             }
@@ -177,14 +177,14 @@ class PostgresConnector {
                 return dayjs(value).toISOString();
             }
         }
-        else if (field.type == AdminForthTypes.BOOLEAN) {
+        else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return value ? 1 : 0;
         }
         return value;
     }
     getData(_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 columns = resource.dataSourceColumns.map((col) => `"${col.name}"`).join(', ');
             const tableName = resource.table;
             let totalCounter = 1;
             const where = filters.length ? `WHERE ${filters.map((f, i) => {
@@ -232,7 +232,7 @@ class PostgresConnector {
             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);
+                console.log('🪲 PG selectQuery:', selectQuery, 'params:', d);
             }
             const stmt = yield this.db.query(selectQuery, d);
             const rows = stmt.rows;

package/dist/dataConnectors/sqlite.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import betterSqlite3 from 'better-sqlite3';
-import { AdminForthTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
 import dayjs from 'dayjs';
 class SQLiteConnector {
     constructor({ url }) {
@@ -41,36 +41,36 @@ class SQLiteConnector {
                 const field = {};
                 const baseType = row.type.toLowerCase();
                 if (baseType == 'int') {
-                    field.type = AdminForthTypes.INTEGER;
+                    field.type = AdminForthDataTypes.INTEGER;
                     field._underlineType = 'int';
                 }
                 else if (baseType.includes('varchar(')) {
-                    field.type = AdminForthTypes.STRING;
+                    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 = AdminForthTypes.TEXT;
+                    field.type = AdminForthDataTypes.TEXT;
                     field._underlineType = 'text';
                 }
                 else if (baseType.includes('decimal(')) {
-                    field.type = AdminForthTypes.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 = AdminForthTypes.FLOAT; //8-byte IEEE floating point number. It
+                    field.type = AdminForthDataTypes.FLOAT; //8-byte IEEE floating point number. It
                     field._underlineType = 'real';
                 }
                 else if (baseType == 'timestamp') {
-                    field.type = AdminForthTypes.DATETIME;
+                    field.type = AdminForthDataTypes.DATETIME;
                     field._underlineType = 'timestamp';
                 }
                 else if (baseType == 'boolean') {
-                    field.type = AdminForthTypes.BOOLEAN;
+                    field.type = AdminForthDataTypes.BOOLEAN;
                     field._underlineType = 'boolean';
                 }
                 else {
@@ -93,7 +93,7 @@ class SQLiteConnector {
         }
     }
     getFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
                 return null;
             }
@@ -107,7 +107,7 @@ class SQLiteConnector {
                 throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps). Issue in field "${field.name}"`);
             }
         }
-        else if (field.type == AdminForthTypes.BOOLEAN) {
+        else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return !!value;
         }
         return value;
@@ -129,7 +129,7 @@ class SQLiteConnector {
         });
     }
     setFieldValue(field, value) {
-        if (field.type == AdminForthTypes.DATETIME) {
+        if (field.type == AdminForthDataTypes.DATETIME) {
             if (!value) {
                 return null;
             }
@@ -142,7 +142,7 @@ class SQLiteConnector {
                 return dayjs(value).toISOString();
             }
         }
-        else if (field.type == AdminForthTypes.BOOLEAN) {
+        else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return value ? 1 : 0;
         }
         return value;
@@ -188,6 +188,9 @@ class SQLiteConnector {
         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

package/dist/index.js

@@ -23,8 +23,9 @@ import ExpressServer from './servers/express.js';
 import { v1 as uuid } from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION } from './modules/utils.js';
-import { AdminForthFilterOperators, AdminForthTypes } from './types.js';
+import { AdminForthFilterOperators, AdminForthDataTypes } from './types/AdminForthConfig.js';
 import { getFunctionList } from './modules/utils.js';
+import path from 'path';
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
 const DEFAULT_ALLOWED_ACTIONS = { create: true, edit: true, show: true, delete: true };
 class AdminForth {
@@ -51,8 +52,18 @@ class AdminForth {
         }
         ;
     }
+    checkCustomFileExists(filePath) {
+        if (filePath.startsWith('@@/')) {
+            const checkPath = path.join(this.config.customization.customComponentsDir, filePath.replace('@@/', ''));
+            if (!fs.existsSync(checkPath)) {
+                return [`File file ${filePath} does not exist in ${this.config.customization.customComponentsDir}`];
+            }
+        }
+        return [];
+    }
     validateConfig() {
         var _b;
+        const errors = [];
         if (this.config.rootUser) {
             if (!this.config.rootUser.username) {
                 throw new Error('rootUser.username is required');
@@ -69,6 +80,12 @@ class AdminForth {
             if (!this.config.auth.passwordHashField) {
                 throw new Error('No config.auth.passwordHashField defined');
             }
+            if (!this.config.auth.usernameField) {
+                throw new Error('No config.auth.usernameField defined');
+            }
+            if (this.config.auth.loginBackgroundImage) {
+                errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+            }
             const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
             if (!userResource) {
                 throw new Error(`Resource with id "${this.config.auth.resourceId}" not found`);
@@ -80,7 +97,6 @@ class AdminForth {
         if (!this.config.customization.customComponentsDir) {
             this.config.customization.customComponentsDir = './custom';
         }
-        const errors = [];
         if (!this.config.baseUrl) {
             this.config.baseUrl = '';
         }
@@ -88,10 +104,7 @@ class AdminForth {
             this.config.customization.brandName = 'AdminForth';
         }
         if (this.config.customization.brandLogo) {
-            if (!this.config.customization.brandLogo.startsWith('@@/')) {
-                errors.push(`Brand logo must start with @@ and be placed in custom directory`);
-            }
-            // todo check file exist
+            errors.push(...this.checkCustomFileExists(this.config.customization.brandLogo));
         }
         if (!this.config.customization.datesFormat) {
             this.config.customization.datesFormat = 'MMM D, YYYY HH:mm:ss';
@@ -356,6 +369,16 @@ class AdminForth {
                         throw new Error('No config.auth defined');
                     }
                     const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
+                    // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
+                    if (!userResource.dataSourceColumns.find((col) => col.name === this.config.auth.passwordHashField)) {
+                        userResource.dataSourceColumns.push({
+                            name: this.config.auth.passwordHashField,
+                            backendOnly: true,
+                            showIn: [],
+                            type: _a.Types.STRING,
+                        });
+                        console.log('Adding passwordHashField to userResource', userResource);
+                    }
                     const userRecord = (_c = (yield this.connectors[userResource.dataSource].getData({
                         resource: userResource,
                         filters: [
@@ -680,12 +703,12 @@ class AdminForth {
                 const item = yield this.connectors[resource.dataSource].getMinMaxForColumns({
                     resource,
                     columns: resource.columns.filter((col) => [
-                        AdminForthTypes.INTEGER,
-                        AdminForthTypes.FLOAT,
-                        AdminForthTypes.DATE,
-                        AdminForthTypes.DATETIME,
-                        AdminForthTypes.TIME,
-                        AdminForthTypes.DECIMAL,
+                        AdminForthDataTypes.INTEGER,
+                        AdminForthDataTypes.FLOAT,
+                        AdminForthDataTypes.DATE,
+                        AdminForthDataTypes.DATETIME,
+                        AdminForthDataTypes.TIME,
+                        AdminForthDataTypes.DECIMAL,
                     ].includes(col.type) && col.allowMinMaxQuery === true),
                 });
                 return item;
@@ -883,7 +906,7 @@ class AdminForth {
     }
 }
 _a = AdminForth, _AdminForth_defaultConfig = new WeakMap();
-AdminForth.Types = AdminForthTypes;
+AdminForth.Types = AdminForthDataTypes;
 AdminForth.Utils = {
     generatePasswordHash: (password) => __awaiter(void 0, void 0, void 0, function* () {
         return yield Auth.generatePasswordHash(password);

package/dist/modules/codeInjector.js

@@ -29,10 +29,29 @@ function hashify(obj) {
     return crypto.createHash('sha256').update(JSON.stringify(obj)).digest('hex');
 }
 class CodeInjector {
+    cleanup() {
+        console.log('Cleaning up...');
+        this.allWatchers.forEach((watcher) => {
+            watcher.removeAll();
+        });
+    }
     constructor(adminforth) {
+        this.allWatchers = [];
         this.allComponentNames = {};
         this.srcFoldersToSync = {};
         this.adminforth = adminforth;
+        process.on('SIGINT', () => {
+            console.log('Received SIGINT.');
+            this.cleanup();
+        });
+        process.on('SIGTERM', () => {
+            console.log('Received SIGTERM.');
+            this.cleanup();
+        });
+        process.on('exit', () => {
+            console.log('Exiting.');
+            this.cleanup();
+        });
     }
     // async runShell({command, verbose = false}) {
     //   console.log(`⚙️ Running shell ${command}...`);
@@ -154,6 +173,13 @@ class CodeInjector {
                 if (process.env.HEAVY_DEBUG) {
                     console.log(`🪲 await fsExtra.copy from ${path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa')}, ${CodeInjector.SPA_TMP_PATH}`);
                 }
+                // try to rm SPA_TMP_PATH/src/types directory 
+                try {
+                    yield fs.promises.rm(path.join(CodeInjector.SPA_TMP_PATH, 'src', 'types'), { recursive: true });
+                }
+                catch (e) {
+                    // ignore
+                }
                 yield fsExtra.copy(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa'), CodeInjector.SPA_TMP_PATH, {
                     filter: (src) => {
                         if (process.env.HEAVY_DEBUG) {
@@ -162,6 +188,7 @@ class CodeInjector {
                         return !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist');
                     },
                     overwrite: true,
+                    dereference: true, // needed to dereference types
                 });
                 // copy whole custom directory
                 if ((_b = this.adminforth.config.customization) === null || _b === void 0 ? void 0 : _b.customComponentsDir) {
@@ -358,9 +385,7 @@ class CodeInjector {
                 console.log(`File ${file} changed, preparing sources...`);
                 yield this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
             }));
-            process.on('exit', () => {
-                watcher.removeAll();
-            });
+            this.allWatchers.push(watcher);
         });
     }
     watchCustomComponentsForCopy(_a) {
@@ -405,9 +430,7 @@ class CodeInjector {
                     recursive: true,
                 });
             }));
-            process.on('exit', () => {
-                watcher.removeAll();
-            });
+            this.allWatchers.push(watcher);
         });
     }
     bundleNow(_a) {

package/dist/spa/spa/src/utils.ts

@@ -1,6 +1,7 @@
 import { onMounted, ref, resolveComponent } from 'vue';
 
 import router from "./router";
+import { useCoreStore } from './stores/core';
 
 export async function callApi({path, method, body=undefined} ) {
   const options = {
@@ -62,3 +63,13 @@ export const loadFile = (file: string) => {
   }
   return baseUrl;
 }
+
+// export function checkEmptyValues(value: any, viewType:'show' | 'list' | 'create' | 'edit') {
+//   const config: = useCoreStore().config;
+//   const emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '---';
+
+//   if (value === null || value === undefined || value === '') {
+//     return emptyFieldPlaceholder;
+//   }
+//   return value;
+// }

package/dist/spa/spa/src/views/LoginView.vue

@@ -7,6 +7,10 @@
       'background-blend-mode': 'darken'
     }: {}"
     >
+
+    {{ coreStore.config?.brandLogo }}
+    <img 
+     :src="loadFile('@@/logo2.png')" class="w-40 h-40" alt="logo" />
    <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
@@ -114,6 +118,7 @@ async function login() {
     } else {
       error.value = null;
       router.push('/');
+      await router.isReady();
       await coreStore.fetchMenuAndResource();
       setTimeout(() => {
         initFlowbite();

package/dist/types/AdminForthConfig.js

@@ -1 +1,33 @@
-export {};
+export var AdminForthDataTypes;
+(function (AdminForthDataTypes) {
+    AdminForthDataTypes["STRING"] = "string";
+    AdminForthDataTypes["INTEGER"] = "integer";
+    AdminForthDataTypes["FLOAT"] = "float";
+    AdminForthDataTypes["DECIMAL"] = "decimal";
+    AdminForthDataTypes["BOOLEAN"] = "boolean";
+    AdminForthDataTypes["DATE"] = "date";
+    AdminForthDataTypes["DATETIME"] = "datetime";
+    AdminForthDataTypes["TIME"] = "time";
+    AdminForthDataTypes["TEXT"] = "text";
+    AdminForthDataTypes["JSON"] = "json";
+})(AdminForthDataTypes || (AdminForthDataTypes = {}));
+export var AdminForthFilterOperators;
+(function (AdminForthFilterOperators) {
+    AdminForthFilterOperators["EQ"] = "eq";
+    AdminForthFilterOperators["NE"] = "ne";
+    AdminForthFilterOperators["GT"] = "gt";
+    AdminForthFilterOperators["LT"] = "lt";
+    AdminForthFilterOperators["GTE"] = "gte";
+    AdminForthFilterOperators["LTE"] = "lte";
+    AdminForthFilterOperators["LIKE"] = "like";
+    AdminForthFilterOperators["ILIKE"] = "ilike";
+    AdminForthFilterOperators["IN"] = "in";
+    AdminForthFilterOperators["NIN"] = "nin";
+})(AdminForthFilterOperators || (AdminForthFilterOperators = {}));
+;
+export var AdminForthSortDirections;
+(function (AdminForthSortDirections) {
+    AdminForthSortDirections["ASC"] = "asc";
+    AdminForthSortDirections["DESC"] = "desc";
+})(AdminForthSortDirections || (AdminForthSortDirections = {}));
+;

package/index.ts

@@ -9,9 +9,9 @@ import ExpressServer from './servers/express.js';
 import {v1 as uuid} from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION } from './modules/utils.js';
-import { AdminForthFilterOperators, AdminForthTypes, AdminForthTypesValues } from './types.js';
-import { AdminForthConfig } from './types/AdminForthConfig.js';
+import { AdminForthConfig, AdminForthClass, AdminForthFilterOperators, AdminForthDataTypes } from './types/AdminForthConfig.js';
 import { getFunctionList } from './modules/utils.js';
+import path from 'path';
 
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
 const DEFAULT_ALLOWED_ACTIONS = {create: true, edit: true, show: true, delete: true};
@@ -22,9 +22,8 @@ type ValidationObject = {
   message: string,
 }
 
-class AdminForth {
-  static Types = AdminForthTypes;
-
+class AdminForth implements AdminForthClass {
+  static Types = AdminForthDataTypes;
 
   static Utils = {
     generatePasswordHash: async (password) => {
@@ -48,7 +47,6 @@ class AdminForth {
     dbDiscover?: 'running' | 'done',
   }
 
-
   constructor(config: AdminForthConfig) {
     this.config = {...this.#defaultConfig,...config};
     this.codeInjector = new CodeInjector(this);
@@ -72,7 +70,19 @@ class AdminForth {
     };
   }
 
+  checkCustomFileExists(filePath: string): Array<string> {
+    if (filePath.startsWith('@@/')) {
+      const checkPath = path.join(this.config.customization.customComponentsDir, filePath.replace('@@/', ''));
+      if (!fs.existsSync(checkPath)) {
+        return [`File file ${filePath} does not exist in ${this.config.customization.customComponentsDir}`];
+      }
+    }
+    return [];
+  }
+
   validateConfig() {
+    const errors = [];
+
     if (this.config.rootUser) {
       if (!this.config.rootUser.username) {
         throw new Error('rootUser.username is required');
@@ -91,6 +101,12 @@ class AdminForth {
       if (!this.config.auth.passwordHashField) {
         throw new Error('No config.auth.passwordHashField defined');
       }
+      if (!this.config.auth.usernameField) {
+        throw new Error('No config.auth.usernameField defined');
+      }
+      if (this.config.auth.loginBackgroundImage) {
+        errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+      }
       const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
       if (!userResource) {
         throw new Error(`Resource with id "${this.config.auth.resourceId}" not found`);
@@ -106,7 +122,6 @@ class AdminForth {
     }
 
 
-    const errors = [];
     if (!this.config.baseUrl) {
       this.config.baseUrl = '';
     }
@@ -114,10 +129,7 @@ class AdminForth {
       this.config.customization.brandName = 'AdminForth';
     }
     if (this.config.customization.brandLogo) {
-      if (!this.config.customization.brandLogo.startsWith('@@/')) {
-        errors.push(`Brand logo must start with @@ and be placed in custom directory`);
-      }
-      // todo check file exist
+      errors.push(...this.checkCustomFileExists(this.config.customization.brandLogo));
     }
     
 
@@ -422,6 +434,17 @@ class AdminForth {
             throw new Error('No config.auth defined');
           }
           const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
+          // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
+          if (!userResource.dataSourceColumns.find((col) => col.name === this.config.auth.passwordHashField)) {
+            userResource.dataSourceColumns.push({
+              name: this.config.auth.passwordHashField,
+              backendOnly: true,
+              showIn: [],
+              type: AdminForth.Types.STRING,
+            });
+            console.log('Adding passwordHashField to userResource', userResource)
+          }
+
           const userRecord = (
             await this.connectors[userResource.dataSource].getData({
               resource: userResource,
@@ -775,12 +798,12 @@ class AdminForth {
         const item = await this.connectors[resource.dataSource].getMinMaxForColumns({
           resource,
           columns: resource.columns.filter((col) => [
-            AdminForthTypes.INTEGER, 
-            AdminForthTypes.FLOAT,
-            AdminForthTypes.DATE,
-            AdminForthTypes.DATETIME,
-            AdminForthTypes.TIME,
-            AdminForthTypes.DECIMAL,
+            AdminForthDataTypes.INTEGER, 
+            AdminForthDataTypes.FLOAT,
+            AdminForthDataTypes.DATE,
+            AdminForthDataTypes.DATETIME,
+            AdminForthDataTypes.TIME,
+            AdminForthDataTypes.DECIMAL,
           ].includes(col.type) && col.allowMinMaxQuery === true),
         });
         return item;

package/modules/codeInjector.ts

@@ -11,6 +11,7 @@ import { ADMIN_FORTH_ABSOLUTE_PATH } from './utils.js';
 import { getComponentNameFromPath } from './utils.js';
 
 
+
 let TMP_DIR;
 
 try {
@@ -29,14 +30,36 @@ function hashify(obj) {
 
 class CodeInjector {
 
+  allWatchers = [];
   adminforth: AdminForth;
   allComponentNames: { [key: string]: string } = {};
   srcFoldersToSync: { [key: string]: string } = {};
 
   static SPA_TMP_PATH = path.join(TMP_DIR, 'adminforth', 'spa_tmp');
 
+  cleanup() {
+    console.log('Cleaning up...');
+    this.allWatchers.forEach((watcher) => {
+      watcher.removeAll();
+    });
+  }
   constructor(adminforth) {
     this.adminforth = adminforth;
+
+    process.on('SIGINT', () => {
+      console.log('Received SIGINT.');
+      this.cleanup(); 
+    });
+    
+    process.on('SIGTERM', () => {
+      console.log('Received SIGTERM.');
+      this.cleanup();
+    });
+
+    process.on('exit', () => {
+      console.log('Exiting.');
+      this.cleanup();
+    });
   }
 
   // async runShell({command, verbose = false}) {
@@ -164,6 +187,13 @@ class CodeInjector {
         console.log(`🪲 await fsExtra.copy from ${path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa')}, ${CodeInjector.SPA_TMP_PATH}`);
       }
 
+      // try to rm SPA_TMP_PATH/src/types directory 
+      try {
+        await fs.promises.rm(path.join(CodeInjector.SPA_TMP_PATH, 'src', 'types'), { recursive: true });
+      } catch (e) {
+        // ignore
+      }
+
       await fsExtra.copy(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa'), CodeInjector.SPA_TMP_PATH, {
         filter: (src) => {
           if (process.env.HEAVY_DEBUG) {
@@ -173,6 +203,7 @@ class CodeInjector {
           return !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist');
         },
         overwrite: true,
+        dereference: true, // needed to dereference types
       });
 
       // copy whole custom directory
@@ -416,9 +447,7 @@ async watchForReprepare({ verbose }) {
         await this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
       }
     )
-    process.on('exit', () => {
-      watcher.removeAll();
-    });
+    this.allWatchers.push(watcher);
   }
 
   async watchCustomComponentsForCopy({ verbose }) {
@@ -471,9 +500,7 @@ async watchForReprepare({ verbose }) {
         });
       }
     )
-    process.on('exit', () => {
-      watcher.removeAll();
-    });
+    this.allWatchers.push(watcher);
   }
 
   async bundleNow({hotReload = false, verbose = false}: {hotReload: boolean, verbose: boolean}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugins/base.ts

@@ -1,13 +1,12 @@
-import { AdminForthResource } from '../types/AdminForthConfig.js';
-import AdminForth from '../index.js';
+import { AdminForthResource, AdminForthPluginType, AdminForthClass } from '../types/AdminForthConfig.js';
 import { getComponentNameFromPath } from '../modules/utils.js';
 import { currentFileDir } from '../modules/utils.js';
 import path from 'path';
 import fs from 'fs';
 
-export default class AdminForthPlugin {
+export default class AdminForthPlugin implements AdminForthPluginType {
 
-  adminforth: AdminForth;
+  adminforth: AdminForthClass;
   pluginDir: string;
   customFolderName: string = 'custom';
 
@@ -16,7 +15,7 @@ export default class AdminForthPlugin {
     this.pluginDir = currentFileDir(metaUrl);
   }
 
-  modifyResourceConfig(adminforth: AdminForth, resourceConfig: AdminForthResource) {
+  modifyResourceConfig(adminforth: AdminForthClass, resourceConfig: AdminForthResource) {
     this.adminforth = adminforth;
   }
 

package/spa/src/utils.ts

@@ -1,6 +1,7 @@
 import { onMounted, ref, resolveComponent } from 'vue';
 
 import router from "./router";
+import { useCoreStore } from './stores/core';
 
 export async function callApi({path, method, body=undefined} ) {
   const options = {
@@ -62,3 +63,13 @@ export const loadFile = (file: string) => {
   }
   return baseUrl;
 }
+
+// export function checkEmptyValues(value: any, viewType:'show' | 'list' | 'create' | 'edit') {
+//   const config: = useCoreStore().config;
+//   const emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '---';
+
+//   if (value === null || value === undefined || value === '') {
+//     return emptyFieldPlaceholder;
+//   }
+//   return value;
+// }

package/spa/src/views/LoginView.vue

@@ -7,6 +7,10 @@
       'background-blend-mode': 'darken'
     }: {}"
     >
+
+    {{ coreStore.config?.brandLogo }}
+    <img 
+     :src="loadFile('@@/logo2.png')" class="w-40 h-40" alt="logo" />
    <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
@@ -114,6 +118,7 @@ async function login() {
     } else {
       error.value = null;
       router.push('/');
+      await router.isReady();
       await coreStore.fetchMenuAndResource();
       setTimeout(() => {
         initFlowbite();

package/types/AdminForthConfig.ts

@@ -1,4 +1,23 @@
-import AdminForthPlugin from '../plugins/base.js';
+
+
+export interface CodeInjector {
+  srcFoldersToSync: Object;
+  allComponentNames: Object;
+}
+
+export interface AdminForthClass {
+  config: AdminForthConfig;
+  codeInjector: CodeInjector;
+}
+
+
+export interface AdminForthPluginType {
+  adminforth: AdminForthClass;
+  pluginDir: string;
+  customFolderName: string;
+  modifyResourceConfig(adminforth: AdminForthClass, resourceConfig: AdminForthResource): void;
+  componentPath(componentFile: string): string;
+}
 
 export type AdminForthConfigMenuItem = {
     type?: 'heading' | 'group' | 'resource' | 'page' | 'gap' | 'divider',
@@ -20,7 +39,7 @@ export type AdminForthConfigMenuItem = {
 export type AdminForthResourceColumn = {
     name: string,
     label?: string,
-    type?: AdminForthTypesValues,
+    type?: AdminForthDataTypes,
     primaryKey?: boolean,
     required?: boolean | { create: boolean, edit: boolean },
     editingNote?: string | { create: string, edit: string },
@@ -48,8 +67,9 @@ export type AdminForthResource = {
     table: string,
     dataSource: string,
     columns: Array<AdminForthResourceColumn>,
+    dataSourceColumns?: Array<AdminForthResourceColumn>,
     itemLabel?: Function,
-    plugins?: Array<AdminForthPlugin>,
+    plugins?: Array<AdminForthPluginType>,
     hooks?: {
       show?: {
         beforeDatasourceRequest?: Function | Array<Function>,
@@ -153,18 +173,37 @@ export type AdminForthResourceColumnComponent = {
     list?: string,
 }
 
+export enum AdminForthDataTypes {
+  STRING = 'string',
+  INTEGER = 'integer',
+  FLOAT = 'float',
+  DECIMAL = 'decimal',
+  BOOLEAN = 'boolean',
+  DATE = 'date',
+  DATETIME = 'datetime',
+  TIME = 'time',
+  TEXT = 'text',
+  JSON = 'json',
+}
+
+export enum AdminForthFilterOperators {
+  EQ = 'eq',
+  NE = 'ne',
+  GT = 'gt',
+  LT = 'lt',
+  GTE = 'gte',
+  LTE = 'lte',
+  LIKE = 'like',
+  ILIKE = 'ilike',
+  IN = 'in',
+  NIN = 'nin',
+};
+
+export enum AdminForthSortDirections {
+  ASC = 'asc',
+  DESC = 'desc',
+};
 
-export type AdminForthTypesValues = 
-  | 'string'
-  | 'integer'
-  | 'float'
-  | 'decimal'
-  | 'boolean'
-  | 'date'
-  | 'datetime'
-  | 'time'
-  | 'text'
-  | 'json';
 
 export type AdminForthResourceColumnEnumElement = {
     value: string | null,

package/types.ts

@@ -1,36 +0,0 @@
-
-
-// typical types which AdminForth supports
-//
-export const AdminForthTypes = {
-  STRING: 'string',
-  INTEGER: 'integer',
-  FLOAT: 'float',
-  DECIMAL: 'decimal',
-  BOOLEAN: 'boolean',
-  DATE: 'date',
-  DATETIME: 'datetime',
-  TIME: 'time',
-  TEXT: 'text',
-  JSON: 'json',
-}
-
-export type AdminForthTypesValues = keyof typeof AdminForthTypes;
-
-export const AdminForthFilterOperators = {
-  EQ: 'eq',
-  NE: 'ne',
-  GT: 'gt',
-  LT: 'lt',
-  GTE: 'gte',
-  LTE: 'lte',
-  LIKE: 'like',
-  ILIKE: 'ilike',
-  IN: 'in',
-  NIN: 'nin',
-};
-
-export const AdminForthSortDirections = {
-  ASC: 'asc',
-  DESC: 'desc',
-};