move findAdminInstance to dedicated module

Author: ivictbor

adminforth/commands/bundle.js

@@ -1,51 +1,22 @@
-import fs from "fs";
-import { callTsProxy } from "./callTsProxy.js";
-import chalk from "chalk";
+import { callTsProxy, findAdminInstance } from "./callTsProxy.js";
+
 
 async function bundle() {
   console.log("Bundling admin SPA...");
-  const currentDirectory = process.cwd();
-
-  let files = fs.readdirSync(currentDirectory);
-  let instanceFound = false;
-  // try index.ts first
-  if (files.includes("index.ts")) {
-    files = files.filter((file) => file !== "index.ts");
-    files.unshift("index.ts");
-  }
+  const instance = await findAdminInstance();
 
-  for (const file of files) {
-    if (file.endsWith(".ts")) {
-      const fileNoTs = file.replace(/\.ts$/, "");
-      process.env.HEAVY_DEBUG && console.log(`🪲 Trying bundleing ${file}...`);
-      try {
-        await callTsProxy(`
-          import { admin } from './${fileNoTs}.js';
 
-          export async function exec() {
-            return await admin.bundleNow({ hotReload: false });
-          }
-        `);
-        instanceFound = true;
-        break;
+  try {
+    await callTsProxy(`
+      import { admin } from './${instance.file}.js';
 
-      } catch (e) {
-        process.env.HEAVY_DEBUG && console.log(`🪲 File ${file} failed`, e);
+      export async function exec() {
+        return await admin.bundleNow({ hotReload: false });
       }
-    }
-  }
-  if (!instanceFound) {
-    console.error(
-      chalk.red(
-        `Error: No valid instance found to bundle.\n` +
-        `Make sure you have a file in the current directory with a .ts extension, and it exports an ` +
-        chalk.cyan.bold('admin') +
-        ` instance like:\n\n` +
-        chalk.yellow('export const admin = new AdminForth({...})') +
-        `\n\nFor example, adminforth CLI creates an index.ts file which exports the admin instance.`
-      )
-    );
-    return;
+    `);
+
+  } catch (e) {
+    console.log(`Running file ${file} failed`, e);
   }
 }
 

adminforth/commands/callTsProxy.js

@@ -1,6 +1,8 @@
 // callTsProxy.js
 import { spawn } from "child_process";
 import path from "path";
+import fs from "fs";
+import chalk from "chalk";
 
 const currentFilePath = import.meta.url;
 const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
@@ -31,18 +33,17 @@ export function callTsProxy(tsCode) {
           parsed.capturedLogs.forEach((log) => {
             console.log(...log);
           });
+
+          if (parsed.error) {
+            reject(new Error(`${parsed.error}\n${parsed.stack}`));
+          }
           resolve(parsed.result);
         } catch (e) {
           reject(new Error("Invalid JSON from tsproxy: " + stdout));
         }
       } else {
-        try {
-          const parsedError = JSON.parse(stderr);
-          process.env.HEAVY_DEBUG && console.error("🪲 Error from tsproxy. Captured logs:", parsedError.capturedLogs);
-          reject(new Error(parsedError.error));
-        } catch (e) {
-          reject(new Error(stderr));
-        }
+        console.error(`tsproxy exited with non-0, this should never happen, stdout: ${stdout}, stderr: ${stderr}`);
+        reject(new Error(stderr));
       }
     });
 
@@ -52,6 +53,64 @@ export function callTsProxy(tsCode) {
   });
 }
 
+export async function findAdminInstance() {
+  process.env.HEAVY_DEBUG && console.log("🌐 Finding admin instance...");
+  const currentDirectory = process.cwd();
+
+  let files = fs.readdirSync(currentDirectory);
+  let instanceFound = {
+    file: null,
+    version: null,
+  };
+  // try index.ts first
+  if (files.includes("index.ts")) {
+    files = files.filter((file) => file !== "index.ts");
+    files.unshift("index.ts");
+  }
+
+  for (const file of files) {
+    if (file.endsWith(".ts")) {
+      const fileNoTs = file.replace(/\.ts$/, "");
+      process.env.HEAVY_DEBUG && console.log(`🪲 Trying bundleing ${file}...`);
+      try {
+        res = await callTsProxy(`
+          import { admin } from './${fileNoTs}.js';
+
+          export async function exec() {
+            return admin.formatAdminForth();
+          }
+        `);
+        instanceFound.file = fileNoTs;
+        instanceFound.version = res;
+        break;
+
+      } catch (e) {
+        // do our best to guess that this file has a good chance to be admin instance
+        // and show the error so user can fix it
+        const fileContent = fs.readFileSync(file, "utf-8");
+        if (fileContent.includes("export const admin")) {
+          console.error(chalk.red(`Error running ${file}:`, e));
+          process.exit(1);
+        }
+        process.env.HEAVY_DEBUG && console.log(`🪲 File ${file} failed`, e);
+      }
+    }
+  }
+  if (!instanceFound.file) {
+    console.error(
+      chalk.red(
+        `Error: No valid instance found to bundle.\n` +
+        `Make sure you have a file in the current directory with a .ts extension, and it exports an ` +
+        chalk.cyan.bold('admin') +
+        ` instance like:\n\n` +
+        chalk.yellow('export const admin = new AdminForth({...})') +
+        `\n\nFor example, adminforth CLI creates an index.ts file which exports the admin instance.`
+      )
+    );
+    process.exit(1);
+  }
+  return instanceFound;
+}
 
 // Example usage:
 // callTsProxy(`

adminforth/commands/cli.js

@@ -8,6 +8,39 @@ import createApp from "./createApp/main.js";
 import generateModels from "./generateModels.js";
 import createPlugin from "./createPlugin/main.js";
 import createComponent from "./createCustomComponent/main.js";
+import chalk from "chalk";
+import path from "path";
+import fs from "fs";
+
+function showHelp() {
+  console.log(
+    chalk.white("Available commands:\n") +
+    chalk.green('  create-app') + chalk.white('         Create a new AdminForth app\n') +
+    chalk.green('  create-plugin') + chalk.white('      Create a plugin for your AdminForth app\n') +
+    chalk.green('  generate-models') + chalk.white('    Generate TypeScript models from your databases\n') +
+    chalk.green('  bundle') + chalk.white('             Bundles your AdminForth app SPA for production\n') +
+    chalk.green('  component') + chalk.white('          Scaffold a custom Vue component\n')
+  );
+}
+
+function currentFileDir(importMetaUrl) {
+  const filePath = importMetaUrl.replace("file://", "");
+  const fileDir = path.dirname(filePath);
+  return fileDir;
+}
+
+function showVersion() {
+  const ADMIN_FORTH_ABSOLUTE_PATH = path.join(currentFileDir(import.meta.url), '..');
+  
+  const package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
+  
+  const ADMINFORTH_VERSION  = package_json.version;
+
+  console.log(
+    chalk.white('AdminForth CLI version: ') +
+    chalk.cyan.bold(ADMINFORTH_VERSION)
+  );
+}
 
 switch (command) {
   case "create-app":
@@ -22,11 +55,23 @@ switch (command) {
   case "bundle":
     bundle();
     break;
-  case "custom-component":
+  case "component":
     createComponent(args);
     break;
-  default:
+  case "help":
+  case "--help":
+  case "-h":
+    showHelp();
+    break;
+  case "--version":
+  case "version":
+  case "-v":
+    showVersion();
+    break;
+  default: {
     console.log(
-      "Unknown command. Available commands: create-app, create-plugin, generate-models, bundle, custom-component"
+      "Unknown command."
     );
+    showHelp();
+  }
 }

adminforth/commands/proxy.ts

@@ -41,12 +41,19 @@ import path from 'path';
 
     // Restore original console.log
     console.log = origLog;
-    console.log(JSON.stringify({ result, capturedLogs }));
+    console.log(JSON.stringify({ 
+      result, 
+      capturedLogs,
+      error: null 
+    }));
   } catch (error: any) {
     // Restore original console.log
     console.log = origLog;
-    console.error(JSON.stringify({ error: error.message, capturedLogs }));
-    process.exit(1);
+    console.log(JSON.stringify({ 
+      error: error.message, 
+      stack: error.stack,
+      capturedLogs 
+    }));
   } finally {
     await unlink(tmpFile).catch(() => {});
   }