Skip to content

Feature/admin forth/1137/lets remove heavy debug and in #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yaroslav8765 wants to merge 7 commits into
base: next
Choose a base branch
from
Open

Feature/admin forth/1137/lets remove heavy debug and in #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11efdf3
feat: add pino logger
yaroslav8765 Jan 9, 2026
cc90b21
chore: update db logs to support pino logger
yaroslav8765 Jan 9, 2026
6b0d3bb
chore: use logge instead of HEAVY_DEBUG
yaroslav8765 Jan 9, 2026
b7b70f6
chore: enhance logging messages for clarity in baseConnector, codeInj…
yaroslav8765 Jan 9, 2026
9541c4d
fix: correct import path for afLogger in proxy.ts
yaroslav8765 Jan 9, 2026
7b1718b
chore: replace console logging with afLogger for consistent logging a…
yaroslav8765 Jan 9, 2026
c3ae78b
chore: use logger instead of console.log
yaroslav8765 Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions adminforth/basePlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import fs from 'fs';

import crypto from 'crypto';

import { afLogger } from './modules/logger.js';


export default class AdminForthPlugin implements IAdminForthPlugin {

Expand All @@ -24,7 +26,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
this.pluginDir = currentFileDir(metaUrl);
this.customFolderPath = path.join(this.pluginDir, this.customFolderName);
this.pluginOptions = pluginOptions;
process.env.HEAVY_DEBUG && console.log(`🪲 🪲 AdminForthPlugin.constructor`, this.constructor.name);
afLogger.trace(`🪲 🪲 AdminForthPlugin.constructor ${this.constructor.name}`);
this.className = this.constructor.name;
}

Expand All @@ -42,7 +44,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {

const seed = `af_pl_${this.constructor.name}_${resourceConfig.resourceId}_${uniqueness}`;
this.pluginInstanceId = md5hash(seed);
process.env.HEAVY_DEBUG && console.log(`🪲 AdminForthPlugin.modifyResourceConfig`, seed, 'id', this.pluginInstanceId);
afLogger.trace(`🪲 AdminForthPlugin.modifyResourceConfig, ${seed}, 'id', ${this.pluginInstanceId}`);
this.adminforth = adminforth;
}

Expand Down
5 changes: 3 additions & 2 deletions adminforth/commands/bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();


Expand All @@ -16,7 +17,7 @@ async function bundle() {
`);

} catch (e) {
console.log(`Running budndle failed`, e);
afLogger.error(`Running bundle failed`, e);
}
}

Expand Down
15 changes: 8 additions & 7 deletions adminforth/commands/callTsProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import path from "path";
import fs from "fs";
import chalk from "chalk";
import dotenv from "dotenv";
import { afLogger } from './modules/logger.js';

const currentFilePath = import.meta.url;
const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
Expand All @@ -20,7 +21,7 @@ export function callTsProxy(tsCode, silent=false) {
dotenv.config({ path: envPath, override: true });
}

process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
afLogger.trace("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
return new Promise((resolve, reject) => {
const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
env: process.env,
Expand All @@ -42,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);
Copy link

Copilot AI Jan 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The afLogger.log method is being called, but pino loggers don't have a .log() method. This should be changed to an appropriate log level like afLogger.info() or afLogger.debug().

Suggested change
afLogger.log(...log);
const [level, ...args] = log;
if (level && typeof afLogger[level] === "function") {
afLogger[level](...args);
} else {
afLogger.info(...log);
}

Copilot uses AI. Check for mistakes.
});
}

Expand All @@ -59,14 +60,14 @@ export function callTsProxy(tsCode, silent=false) {
}
});

process.env.HEAVY_DEBUG && console.log("🪲 Writing to tsproxy stdin...\n'''", tsCode, "'''");
afLogger.trace("🪲 Writing to tsproxy stdin...\n'''", tsCode, "'''");
child.stdin.write(tsCode);
child.stdin.end();
});
}

export async function findAdminInstance() {
process.env.HEAVY_DEBUG && console.log("🌐 Finding admin instance...");
afLogger.trace("🌐 Finding admin instance...");
const currentDirectory = process.cwd();

let files = fs.readdirSync(currentDirectory);
Expand All @@ -83,7 +84,7 @@ export async function findAdminInstance() {
for (const file of files) {
if (file.endsWith(".ts")) {
const fileNoTs = file.replace(/\.ts$/, "");
process.env.HEAVY_DEBUG && console.log(`🪲 Trying bundleing ${file}...`);
afLogger.trace(`🪲 Trying bundleing ${file}...`);
try {
const res = await callTsProxy(`
import { admin } from './${fileNoTs}.js';
Expand All @@ -104,7 +105,7 @@ export async function findAdminInstance() {
console.error(chalk.red(`Error running ${file}:`, e));
process.exit(1);
}
process.env.HEAVY_DEBUG && console.log(`🪲 File ${file} failed`, e);
afLogger.trace(`🪲 File ${file} failed`, e);
}
}
}
Expand All @@ -130,4 +131,4 @@ export async function findAdminInstance() {
// function exec() {
// return admin.doX();
// }
// `).then(console.log).catch(console.error);
// `).then(afLogger.info).catch(afLogger.error);
4 changes: 2 additions & 2 deletions adminforth/commands/createApp/templates/adminuser.ts.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import AdminForth, { AdminForthDataTypes } from 'adminforth';
import type { AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
import type { AdminForthResourceInput, AdminForthResource, AdminUser, logger } from 'adminforth';
Copy link

Copilot AI Jan 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the template file, the import statement is importing 'logger' as a type from 'adminforth', but logger is not a type - it's a value/export. The import should be: import { Filters, logger } from 'adminforth'; without the 'type' keyword before AdminForthResourceInput.

Suggested change
import type { AdminForthResourceInput, AdminForthResource, AdminUser, logger } from 'adminforth';
import type { AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
import { logger } from 'adminforth';

Copilot uses AI. Check for mistakes.
import { randomUUID } from 'crypto';

async function allowedForSuperAdmin({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
Expand Down Expand Up @@ -94,7 +94,7 @@ export default {
},
edit: {
beforeSave: async ({ oldRecord, updates, adminUser, resource }: { oldRecord: any, updates: any, adminUser: AdminUser, resource: AdminForthResource }) => {
console.log('Updating user', updates);
logger.info('Updating user', updates);
if (oldRecord.id === adminUser.dbUser.id && updates.role) {
return { ok: false, error: 'You cannot change your own role' };
}
Expand Down
6 changes: 3 additions & 3 deletions adminforth/commands/createApp/templates/index.ts.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import AdminForth from 'adminforth';
import usersResource from "./resources/adminuser.js";
import { fileURLToPath } from 'url';
import path from 'path';
import { Filters } from 'adminforth';
import { Filters, logger } from 'adminforth';
import { initApi } from './api.js';

const ADMIN_BASE_URL = '';
Expand Down Expand Up @@ -75,7 +75,7 @@ if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
const port = 3500;

admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development' }).then(() => {
console.log('Bundling AdminForth SPA done.');
logger.info('Bundling AdminForth SPA done.');
});

admin.express.serve(app);
Expand All @@ -91,6 +91,6 @@ if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
});

admin.express.listen(port, () => {
console.log(`\n⚡ AdminForth is available at http://localhost:${port}${ADMIN_BASE_URL}\n`);
logger.info(`\n⚡ AdminForth is available at http://localhost:${port}${ADMIN_BASE_URL}\n`);
});
}
8 changes: 4 additions & 4 deletions adminforth/commands/createApp/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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');
}
}
],
Expand Down
7 changes: 4 additions & 3 deletions adminforth/commands/createCustomComponent/configLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down Expand Up @@ -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);
}
}
Loading
Loading