Skip to content

Commit bbccede

Browse files
committed
fix: fix "adminforth component" command
1 parent 28ed53f commit bbccede

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

adminforth/commands/createCustomComponent/configLoader.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from 'fs/promises';
22
import path from 'path';
33
import chalk from 'chalk';
44
import jiti from 'jiti';
5-
import dotenv from "dotenv";
5+
import dotenv, { config } from "dotenv";
66

77
dotenv.config({ path: '.env.local', override: true });
88
dotenv.config({ path: '.env', override: true });
@@ -29,7 +29,7 @@ export async function getAdminInstance() {
2929
const configModule = _require(configPath);
3030

3131
const adminInstance = configModule.admin || configModule.default?.admin;
32-
return adminInstance;
32+
return { adminInstance, configPath, configFileName };
3333
} catch (error) {
3434
console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}`));
3535
console.error(error);
@@ -38,9 +38,10 @@ export async function getAdminInstance() {
3838
}
3939

4040
export async function loadAdminForthConfig() {
41-
try {
42-
const adminInstance = getAdminInstance();
41+
42+
const { adminInstance, configPath, configFileName } = await getAdminInstance();
4343

44+
try {
4445
if (!adminInstance) {
4546
throw new Error(`Could not find 'admin' export in ${configFileName}. Please ensure your config file exports the AdminForth instance like: 'export const admin = new AdminForth({...});'`);
4647
}
@@ -63,7 +64,7 @@ export async function loadAdminForthConfig() {
6364
return config;
6465

6566
} catch (error) {
66-
console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}`));
67+
console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}, error: ${error}`));
6768
console.error(error);
6869
process.exit(1);
6970
}

adminforth/commands/generateModels.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ async function generateModels() {
2727
let modelContent = "// Generated model file\n\n";
2828
let instanceFound = false;
2929

30-
const instance = await getAdminInstance();
31-
if (instance) {
32-
await instance.discoverDatabases();
30+
const { adminInstance, configPath, configFileName } = await getAdminInstance();
31+
if (adminInstance) {
32+
await adminInstance.discoverDatabases();
3333
instanceFound = true;
34-
for (const resource of instance.config.resources) {
34+
for (const resource of adminInstance.config.resources) {
3535
if (resource.columns) {
3636
const typeName = toPascalCase(resource.resourceId);
3737
const tsCode = `

0 commit comments

Comments
 (0)