Merge pull request #201 from devforth/next

fix: CLI bundle command, also prevent duplicating of AdminFOrth initi…

Author: ivictbor

adminforth/commands/callTsProxy.js

@@ -7,7 +7,7 @@ import chalk from "chalk";
 const currentFilePath = import.meta.url;
 const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
 
-export function callTsProxy(tsCode) {
+export function callTsProxy(tsCode, silent=false) {
 
   process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
   return new Promise((resolve, reject) => {
@@ -30,9 +30,11 @@ export function callTsProxy(tsCode) {
       if (code === 0) {
         try {
           const parsed = JSON.parse(stdout);
-          parsed.capturedLogs.forEach((log) => {
-            console.log(...log);
-          });
+          if (!silent) {
+            parsed.capturedLogs.forEach((log) => {
+              console.log(...log);
+            });
+          }
 
           if (parsed.error) {
             reject(new Error(`${parsed.error}\n${parsed.stack}`));
@@ -73,13 +75,13 @@ export async function findAdminInstance() {
       const fileNoTs = file.replace(/\.ts$/, "");
       process.env.HEAVY_DEBUG && console.log(`🪲 Trying bundleing ${file}...`);
       try {
-        res = await callTsProxy(`
+        const res = await callTsProxy(`
           import { admin } from './${fileNoTs}.js';
 
           export async function exec() {
             return admin.formatAdminForth();
           }
-        `);
+        `, true);
         instanceFound.file = fileNoTs;
         instanceFound.version = res;
         break;

adminforth/modules/codeInjector.ts

@@ -814,7 +814,7 @@ class CodeInjector implements ICodeInjector {
       // save hash
       await fs.promises.writeFile(path.join(serveDir, '.adminforth_messages_hash'), sourcesHash);
     } else {
-      console.log(`Skipping AdminForth i18n messages extraction - it is already done for these sources set`);
+      console.log(`AdminForth i18n message extraction skipped — build already performed for the current sources.`);
     }
 
     if (!hotReload) {
@@ -836,7 +836,7 @@ class CodeInjector implements ICodeInjector {
         // save hash
         await fs.promises.writeFile(path.join(serveDir, '.adminforth_build_hash'), sourcesHash);
       } else {
-        console.log(`Skipping AdminForth SPA bundle - it is already done for these sources set`);
+        console.log(`Skipping AdminForth SPA bundling - already completed for the current sources.`);
       }
     } else {