chore: replace console logging with afLogger for consistent logging across components

yaroslav8765 · yaroslav8765 · commit 7b1718bdeb37 · 2026-01-09T15:51:26.000+02:00
diff --git a/adminforth/commands/bundle.js b/adminforth/commands/bundle.js
@@ -1,8 +1,9 @@
 import { callTsProxy, findAdminInstance } from "./callTsProxy.js";
+import { afLogger } from '../modules/logger.js';
 
 
 async function bundle() {
-  console.log("Bundling admin SPA...");
+  afLogger.info("Bundling admin SPA...");
   const instance = await findAdminInstance();
     
 
@@ -16,7 +17,7 @@ async function bundle() {
     `);
 
   } catch (e) {
-    console.log(`Running budndle failed`, e);
+    afLogger.error(`Running bundle failed`, e);
   }
 }
 
diff --git a/adminforth/commands/callTsProxy.js b/adminforth/commands/callTsProxy.js
@@ -43,7 +43,7 @@ export function callTsProxy(tsCode, silent=false) {
           const parsed = JSON.parse(stdout);
           if (!silent) {
             parsed.capturedLogs.forEach((log) => {
-              console.log(...log);
+              afLogger.log(...log);
             });
           }
 
@@ -131,4 +131,4 @@ export async function findAdminInstance() {
 //   function exec() {
 //     return admin.doX();
 //   }
-// `).then(console.log).catch(console.error);
+// `).then(afLogger.info).catch(afLogger.error);
diff --git a/adminforth/commands/createApp/utils.js b/adminforth/commands/createApp/utils.js
@@ -12,6 +12,7 @@ import { exec } from 'child_process';
 import Handlebars from 'handlebars';
 import { promisify } from 'util';
 import { getVersion } from '../cli.js';
+import { afLogger } from '../modules/logger.js';
 
 const execAsync = promisify(exec);
 
@@ -335,7 +336,6 @@ async function installDependencies(ctx, cwd) {
       await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
     ]);
   }
-  // console.log(chalk.dim(`Dependencies installed in ${cwd} and ${customDir}: \n${res[0].stdout}${res[1].stdout}`));
 }
 
 function generateFinalInstructions(skipPrismaSetup, options) {
@@ -390,9 +390,9 @@ export function prepareWorkflow(options) {
     {
       title: '📝 Preparing final instructions...',
       task: (ctx) => {
-        console.log(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
-        console.log(generateFinalInstructions(ctx.skipPrismaSetup, options));
-        console.log('\n\n');
+        afLogger.info(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
+        afLogger.info(generateFinalInstructions(ctx.skipPrismaSetup, options));
+        afLogger.info('\n\n');
       }
     }
   ],
diff --git a/adminforth/commands/createCustomComponent/configLoader.js b/adminforth/commands/createCustomComponent/configLoader.js
@@ -3,6 +3,7 @@ import path from 'path';
 import chalk from 'chalk';
 import jiti from 'jiti';
 import dotenv, { config } from "dotenv";
+import { afLogger } from '../modules/logger.js';
 
 dotenv.config({ path: '.env.local', override: true });
 dotenv.config({ path: '.env', override: true });
@@ -59,12 +60,12 @@ export async function loadAdminForthConfig() {
      }
 
 
-    console.log(chalk.dim(`Loaded configuration from ${configPath}`));
+    afLogger.info(chalk.dim(`Loaded configuration from ${configPath}`));
     return config;
 
   } catch (error) {
-    console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath},  error: ${error}`));
-    console.error(error);
+    afLogger.error(chalk.red(`\nError loading or parsing configuration file: ${configPath},  error: ${error}`));
+    afLogger.error(error);
     process.exit(1);
   }
 }
diff --git a/adminforth/commands/createCustomComponent/configUpdater.js b/adminforth/commands/createCustomComponent/configUpdater.js
diff --git a/adminforth/commands/createCustomComponent/fileGenerator.js b/adminforth/commands/createCustomComponent/fileGenerator.js
@@ -4,6 +4,7 @@ import path from 'path';
 import chalk from 'chalk';
 import Handlebars from 'handlebars';
 import { fileURLToPath } from 'url';
+import { afLogger } from '../modules/logger.js';
 
 async function renderHBSTemplate(templatePath, data) {
   try {
@@ -31,7 +32,7 @@ async function generateVueContent(fieldType, { resource, column }) {
     ? path.join(__dirname, 'templates', 'customFields', `${fieldType}.vue.hbs`)
     : path.join(__dirname, 'templates', 'customCrud', `${fieldType}.vue.hbs`);
 
-  console.log(chalk.dim(`Using template: ${templatePath}`));
+  afLogger.info(chalk.dim(`Using template: ${templatePath}`));
 
   const context = {
     componentName,
@@ -61,24 +62,24 @@ export async function generateComponentFile(componentFileName, fieldType, contex
   const customDirPath = path.resolve(projectRoot, customDirRelative);
   const absoluteComponentPath = path.resolve(customDirPath, componentFileName);
   if (fsSync.existsSync(absoluteComponentPath)) {
-    console.log(chalk.yellow(`⚠️ Component file already exists: ${absoluteComponentPath}`));
+    afLogger.warn(chalk.yellow(`⚠️ Component file already exists: ${absoluteComponentPath}`));
     return {"alreadyExists": true, "path": absoluteComponentPath}
   }
   try {
     await fs.mkdir(customDirPath, { recursive: true });
-    console.log(chalk.dim(`Ensured custom directory exists: ${customDirPath}`));
+    afLogger.info(chalk.dim(`Ensured custom directory exists: ${customDirPath}`));
 
     const fileContent = await generateVueContent(fieldType, context);
 
     await fs.writeFile(absoluteComponentPath, fileContent, 'utf-8');
-    console.log(chalk.green(`✅ Generated component file: ${absoluteComponentPath}`));
+    afLogger.info(chalk.green(`✅ Generated component file: ${absoluteComponentPath}`));
 
     return {"alreadyExists": false, "path": absoluteComponentPath}
 
   } catch (error) {
-    console.error(chalk.red(`❌ Error creating component file at ${absoluteComponentPath}:`));
+    afLogger.error(chalk.red(`❌ Error creating component file at ${absoluteComponentPath}:`));
     if (!error.message.includes('template')) {
-       console.error(error);
+       afLogger.error(error);
     }
     throw error;
   }
@@ -91,22 +92,22 @@ export async function generateCrudInjectionComponent(componentFileName, crudType
   const absoluteComponentPath = path.resolve(customDirPath, componentFileName);
 
   if (fsSync.existsSync(absoluteComponentPath)) {
-    console.log(chalk.yellow(`⚠️ Component file already exists: ${absoluteComponentPath}`));
+    afLogger.warn(chalk.yellow(`⚠️ Component file already exists: ${absoluteComponentPath}`));
     return { alreadyExists: true, path: absoluteComponentPath };
   }
 
   try {
     await fs.mkdir(customDirPath, { recursive: true });
-    console.log(chalk.dim(`Ensured custom directory exists: ${customDirPath}`));
+    afLogger.warn(chalk.dim(`Ensured custom directory exists: ${customDirPath}`));
 
     const fileContent = await generateVueContent(crudType, context);
 
     await fs.writeFile(absoluteComponentPath, fileContent, 'utf-8');
-    console.log(chalk.green(`✅ Generated component file: ${absoluteComponentPath}`));
+    afLogger.info(chalk.green(`✅ Generated component file: ${absoluteComponentPath}`));
 
     return { alreadyExists: false, path: absoluteComponentPath };
   } catch (error) {
-    console.error(chalk.red(`❌ Error creating component file at ${absoluteComponentPath}:`));
+    afLogger.error(chalk.red(`❌ Error creating component file at ${absoluteComponentPath}:`));
     throw error;
   }
 }
@@ -118,13 +119,13 @@ export async function generateLoginOrGlobalComponentFile(componentFileName, inje
   const absoluteComponentPath = path.resolve(customDirPath, componentFileName);
 
   if (fsSync.existsSync(absoluteComponentPath)) {
-    console.log(chalk.yellow(`⚠️ Component file already exists: ${absoluteComponentPath}`));
+    afLogger.warn(chalk.yellow(`⚠️ Component file already exists: ${absoluteComponentPath}`));
     return { alreadyExists: true, path: absoluteComponentPath };
   }
 
   try {
     await fs.mkdir(customDirPath, { recursive: true });
-    console.log(chalk.dim(`Ensured custom directory exists: ${customDirPath}`));
+    afLogger.warn(chalk.dim(`Ensured custom directory exists: ${customDirPath}`));
 
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
@@ -138,11 +139,11 @@ export async function generateLoginOrGlobalComponentFile(componentFileName, inje
     const fileContent = await renderHBSTemplate(templatePath, context);
 
     await fs.writeFile(absoluteComponentPath, fileContent, 'utf-8');
-    console.log(chalk.green(`✅ Generated login injection component: ${absoluteComponentPath}`));
+    afLogger.info(chalk.green(`✅ Generated login injection component: ${absoluteComponentPath}`));
 
     return { alreadyExists: false, path: absoluteComponentPath };
   } catch (error) {
-    console.error(chalk.red(`❌ Error creating login component at ${absoluteComponentPath}`));
+    afLogger.error(chalk.red(`❌ Error creating login component at ${absoluteComponentPath}`));
     throw error;
   }
 }
diff --git a/adminforth/commands/createCustomComponent/main.js b/adminforth/commands/createCustomComponent/main.js
@@ -4,6 +4,7 @@ import path from 'path';
 import { loadAdminForthConfig } from './configLoader.js'; // Helper to load config
 import { generateComponentFile, generateLoginOrGlobalComponentFile, generateCrudInjectionComponent } from './fileGenerator.js'; // Helper to create the .vue file
 import { updateResourceConfig, injectLoginComponent, injectGlobalComponent, updateCrudInjectionConfig } from './configUpdater.js'; // Helper to modify resource .ts file
+import { afLogger } from '../modules/logger.js';
 
 function sanitizeLabel(input){
   return input
@@ -14,7 +15,7 @@ function sanitizeLabel(input){
 }
 
 export default async function createComponent(args) {
-  console.log('This command will help you to generate boilerplate for component.\n');
+  afLogger.info('This command will help you to generate boilerplate for component.\n');
 
   const config = await loadAdminForthConfig();
   const resources = config.resources; 
diff --git a/adminforth/commands/postinstall.js b/adminforth/commands/postinstall.js
@@ -2,14 +2,16 @@ import fs from 'fs';
 import path from 'path';
 
 import { execSync } from 'child_process'; 
+import { afLogger } from '../modules/logger.js';
+
 const spaPath = path.join(import.meta.dirname, 'dist', 'spa');
 
 
 if (fs.existsSync(spaPath)){ 
-    console.log('Installing SPA dependencies...');
+    afLogger.info('Installing SPA dependencies...');
     execSync('npm ci', { cwd: spaPath, stdio: 'inherit' });
-    console.log('Installed spa dependencies');
+    afLogger.info('Installed spa dependencies');
 } else {
-    console.log('SPA dependencies not found');
-    console.log('current directory', import.meta.dirname);
+    afLogger.warn('SPA dependencies not found');
+    afLogger.info('current directory', import.meta.dirname);
 }
diff --git a/adminforth/commands/utils.js b/adminforth/commands/utils.js
@@ -1,6 +1,7 @@
 import path from "path";
 import { execSync } from "child_process";
 import fs from "fs";
+import { afLogger } from '../modules/logger.js';
 
 export const toPascalCase = (str) => {
   return str
@@ -131,7 +132,7 @@ export async function getInstance(file, currentDirectory) {
   let filePath = initialFilePath;
 
   if (file.endsWith(".ts")) {
-    console.log(`Compiling TypeScript file: ${file}`);
+    afLogger.info(`Compiling TypeScript file: ${file}`);
     try {
       execSync(
         `./node_modules/.bin/tsc ${filePath} --module ESNext --outDir ./dist`,
@@ -140,7 +141,7 @@ export async function getInstance(file, currentDirectory) {
         }
       );
     } catch (error) {
-      //console.log(`Error: Could not compile TypeScript file '${file}'`);
+      afLogger.error(`Error: Could not compile TypeScript file '${file}'`);
     }
     const distDir = path.join(currentDirectory, "dist");
     processJsFilesInDir(distDir);
diff --git a/adminforth/dataConnectors/baseConnector.ts b/adminforth/dataConnectors/baseConnector.ts
@@ -81,7 +81,6 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
         // in case column isArray and enumerator/foreign resource - IN filter must be transformed into OR filter
         if (filterValidation.ok && f.operator == AdminForthFilterOperators.IN) {
           const column = resource.dataSourceColumns.find((col) => col.name == (f as IAdminForthSingleFilter).field);
-          // console.log(`\n~~~ column: ${JSON.stringify(column, null, 2)}\n~~~ resource.columns: ${JSON.stringify(resource.dataSourceColumns, null, 2)}\n~~~ filter: ${JSON.stringify(f, null, 2)}\n`);
           if (column.isArray?.enabled && (column.enum || column.foreignResource)) {
             filters[fIndex] = {
               operator: AdminForthFilterOperators.OR,
diff --git a/adminforth/dataConnectors/mongo.ts b/adminforth/dataConnectors/mongo.ts
@@ -3,7 +3,7 @@ import { MongoClient } from 'mongodb';
 import { Decimal128, Double } from 'bson';
 import { IAdminForthDataSourceConnector, IAdminForthSingleFilter, IAdminForthAndOrFilter, AdminForthResource } from '../types/Back.js';
 import AdminForthBaseConnector from './baseConnector.js';
-
+import { afLogger } from '../modules/logger.js';
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, } from '../types/Common.js';
 
 const escapeRegex = (value) => {
@@ -36,11 +36,11 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
             try {
                 await this.client.connect();
                 this.client.on('error', (err) => {
-                    console.log('Mongo error: ', err.message)
+                    afLogger.error(`Mongo error: ${err.message}`);
                 });
-                console.log('Connected to Mongo');
+                afLogger.info('Connected to Mongo');
             } catch (e) {
-                console.error(`Failed to connect to Mongo: ${e}`);
+                afLogger.error(`Failed to connect to Mongo: ${e}`);
             }
         })();
     }
diff --git a/adminforth/dataConnectors/postgres.ts b/adminforth/dataConnectors/postgres.ts
@@ -3,7 +3,7 @@ import { AdminForthResource, IAdminForthSingleFilter, IAdminForthAndOrFilter, IA
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, } from '../types/Common.js';
 import AdminForthBaseConnector from './baseConnector.js';
 import pkg from 'pg';
-import { dbLogger } from '../modules/logger.js';
+import { afLogger, dbLogger } from '../modules/logger.js';
 
 const { Client } = pkg;
 
@@ -17,7 +17,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         try {
             await this.client.connect();
             this.client.on('error', async (err) => {
-                console.log('Postgres error: ', err.message, err.stack)
+                afLogger.error(`Postgres error: ${err.message} ${err.stack}`);
                 this.client.end();
                 await new Promise((resolve) => { setTimeout(resolve, 1000) });
                 this.setupClient(url);
@@ -406,8 +406,6 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         }
         const primaryKey = this.getPrimaryKey(resource);
         const q = `INSERT INTO "${tableName}" (${columns.join(', ')}) VALUES (${placeholders}) RETURNING "${primaryKey}"`;
-    //   console.log('\n🔵 [PG INSERT]:', q);
-    //   console.log('📦 [VALUES]:', JSON.stringify(values, null, 2));
         dbLogger.trace(`🪲📜 PG Q: ${q}, values: ${JSON.stringify(values)}`);
         const ret = await this.client.query(q, values);
         return ret.rows[0][primaryKey];
diff --git a/adminforth/dataConnectors/sqlite.ts b/adminforth/dataConnectors/sqlite.ts
@@ -335,10 +335,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       const columns = Object.keys(record);
       const placeholders = columns.map(() => '?').join(', ');
       const values = columns.map((colName) => record[colName]);
-      // const q = this.client.prepare(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`);
       const sql = `INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`;
-      //console.log('\n🟢 [SQLITE INSERT]:', sql);
-      //console.log('📦 [VALUES]:', JSON.stringify(values, null, 2));
       const q = this.client.prepare(sql);
       dbLogger.trace(`🪲📜 SQLITE Q: ${sql}, values: ${JSON.stringify(values)}`);
       const ret = await q.run(values);
diff --git a/adminforth/index.ts b/adminforth/index.ts
@@ -176,7 +176,7 @@ class AdminForth implements IAdminForth {
       dbDiscover: 'running',
     };
 
-    console.log(`${this.formatAdminForth()} v${ADMINFORTH_VERSION} initializing...`);
+    console.info(`${this.formatAdminForth()} v${ADMINFORTH_VERSION} initializing...`);
     afLogger.trace('🔧 About to set global.adminforth...');
     global.adminforth = this;
     afLogger.trace('🔧 global.adminforth set successfully');
@@ -441,13 +441,11 @@ class AdminForth implements IAdminForth {
       this.operationalResources[resource.resourceId] = new OperationalResource(this.connectors[resource.dataSource], resource);
     });
 
-    // console.log('⚙️⚙️⚙️ Database discovery done', JSON.stringify(this.config.resources, null, 2));
   }
 
   async getAllTables(): Promise<{ [dataSourceId: string]: string[] }> {
     const results: { [dataSourceId: string]: string[] } = {};
   
-    // console.log('Connectors to process:', Object.keys(this.connectors));
     if (!this.config.databaseConnectors) {
       this.config.databaseConnectors = {...this.connectorClasses};
     }
@@ -463,7 +461,6 @@ class AdminForth implements IAdminForth {
             results[dataSourceId] = [];
           }
         } else {
-          // console.log(`Connector ${dataSourceId} does not have getAllTables method`);
           results[dataSourceId] = [];
         }
       })
@@ -552,7 +549,7 @@ class AdminForth implements IAdminForth {
 
     // execute hook if needed
     for (const hook of listify(resource.hooks?.create?.beforeSave)) {
-      console.log('🪲 Hook beforeSave', hook);
+      console.debug('🪲 Hook beforeSave', hook);
       const resp = await hook({ 
         resource, 
         record, 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`import { callTsProxy, findAdminInstance } from "./callTsProxy.js";`
	`2`	`+import { afLogger } from '../modules/logger.js';`
`2`	`3`
`3`	`4`
`4`	`5`	`async function bundle() {`
`5`		`- console.log("Bundling admin SPA...");`
	`6`	`+ afLogger.info("Bundling admin SPA...");`
`6`	`7`	`const instance = await findAdminInstance();`
`7`	`8`
`8`	`9`
`@@ -16,7 +17,7 @@ async function bundle() {`
`16`	`17`	`);
`17`	`18`
`18`	`19`	`} catch (e) {`
`19`		- console.log(`Running budndle failed`, e);
	`20`	+ afLogger.error(`Running bundle failed`, e);
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import { exec } from 'child_process';`
`12`	`12`	`import Handlebars from 'handlebars';`
`13`	`13`	`import { promisify } from 'util';`
`14`	`14`	`import { getVersion } from '../cli.js';`
	`15`	`+import { afLogger } from '../modules/logger.js';`
`15`	`16`
`16`	`17`	`const execAsync = promisify(exec);`
`17`	`18`
`@@ -335,7 +336,6 @@ async function installDependencies(ctx, cwd) {`
`335`	`336`	await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
`336`	`337`	`]);`
`337`	`338`	`}`
`338`		- // console.log(chalk.dim(`Dependencies installed in ${cwd} and ${customDir}: \n${res[0].stdout}${res[1].stdout}`));
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`function generateFinalInstructions(skipPrismaSetup, options) {`
`@@ -390,9 +390,9 @@ export function prepareWorkflow(options) {`
`390`	`390`	`{`
`391`	`391`	`title: '📝 Preparing final instructions...',`
`392`	`392`	`task: (ctx) => {`
`393`		- console.log(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
`394`		`- console.log(generateFinalInstructions(ctx.skipPrismaSetup, options));`
`395`		`- console.log('\n\n');`
	`393`	+ afLogger.info(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
	`394`	`+ afLogger.info(generateFinalInstructions(ctx.skipPrismaSetup, options));`
	`395`	`+ afLogger.info('\n\n');`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`	`],`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import path from 'path';`
`3`	`3`	`import chalk from 'chalk';`
`4`	`4`	`import jiti from 'jiti';`
`5`	`5`	`import dotenv, { config } from "dotenv";`
	`6`	`+import { afLogger } from '../modules/logger.js';`
`6`	`7`
`7`	`8`	`dotenv.config({ path: '.env.local', override: true });`
`8`	`9`	`dotenv.config({ path: '.env', override: true });`
`@@ -59,12 +60,12 @@ export async function loadAdminForthConfig() {`
`59`	`60`	`}`
`60`	`61`
`61`	`62`
`62`		- console.log(chalk.dim(`Loaded configuration from ${configPath}`));
	`63`	+ afLogger.info(chalk.dim(`Loaded configuration from ${configPath}`));
`63`	`64`	`return config;`
`64`	`65`
`65`	`66`	`} catch (error) {`
`66`		- console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}, error: ${error}`));
`67`		`- console.error(error);`
	`67`	+ afLogger.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}, error: ${error}`));
	`68`	`+ afLogger.error(error);`
`68`	`69`	`process.exit(1);`
`69`	`70`	`}`
`70`	`71`	`}`