adminforth 1.2.10 → 1.2.12

package/dist/index.js

@@ -104,8 +104,8 @@ class AdminForth {
         });
     }
     bundleNow(_b) {
-        return __awaiter(this, arguments, void 0, function* ({ hotReload = false, verbose = false }) {
-            yield this.codeInjector.bundleNow({ hotReload, verbose });
+        return __awaiter(this, arguments, void 0, function* ({ hotReload = false }) {
+            yield this.codeInjector.bundleNow({ hotReload });
         });
     }
     getUserByPk(pk) {

package/dist/modules/codeInjector.js

@@ -51,7 +51,7 @@ class CodeInjector {
             process.exit();
         }));
     }
-    // async runShell({command, verbose = false}) {
+    // async runShell({ command }) {
     //   console.log(`⚙️ Running shell ${command}...`);
     //   console.time(`${command} done in`);
     //   const { stdout: out, stderr: err } = await execAsync(command);
@@ -59,22 +59,20 @@ class CodeInjector {
     //   console.log(`Command ${command} output:`, out, err);
     // }
     runNpmShell(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ command, verbose = false, cwd }) {
+        return __awaiter(this, arguments, void 0, function* ({ command, cwd }) {
             const nodeBinary = process.execPath; // Path to the Node.js binary running this script
             const npmPath = path.join(path.dirname(nodeBinary), 'npm'); // Path to the npm executable
             const env = Object.assign({ VITE_ADMINFORTH_PUBLIC_PATH: this.adminforth.config.baseUrl, FORCE_COLOR: '1' }, process.env);
-            console.log(`⚙️ Running npm ${command}...`);
+            console.log(`⚙️ exec: npm ${command}...`);
             console.time(`npm ${command} done in`);
             const { stdout: out, stderr: err } = yield execAsync(`${nodeBinary} ${npmPath} ${command}`, {
                 cwd,
                 env,
             });
             console.timeEnd(`npm ${command} done in`);
-            if (verbose) {
-                console.log(`npm ${command} output:`, out);
-            }
+            process.env.HEAVY_DEBUG && console.log(`🪲 npm ${command} output:`, out);
             if (err) {
-                console.error(`npm ${command} errors/warnings:`, err);
+                process.env.HEAVY_DEBUG && console.error(`🪲npm ${command} errors/warnings:`, err);
             }
         });
     }
@@ -90,7 +88,7 @@ class CodeInjector {
         });
     }
     prepareSources(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ filesUpdated, verbose = false }) {
+        return __awaiter(this, arguments, void 0, function* ({ filesUpdated }) {
             var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             // check SPA_TMP_PATH exists and create if not
             try {
@@ -361,9 +359,9 @@ class CodeInjector {
             /* customPackageLock */
             let usersLockHash = '';
             let usersLock = null;
+            let usersPackage = null;
             if ((_m = this.adminforth.config.customization) === null || _m === void 0 ? void 0 : _m.customComponentsDir) {
                 const usersPackagePath = path.join(this.adminforth.config.customization.customComponentsDir, 'package.json');
-                let usersPackage = null;
                 try {
                     usersPackage = JSON.parse(yield fs.promises.readFile(usersPackagePath, 'utf-8'));
                 }
@@ -381,49 +379,45 @@ class CodeInjector {
                     }
                     usersLockHash = hashify(usersLock);
                 }
-                const iconPackagesNamesHash = hashify(iconPackageNames);
-                const fullHash = `${spaLockHash}::${iconPackagesNamesHash}::${usersLockHash}`;
-                const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
-                try {
-                    const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
-                    if (existingHash === fullHash) {
-                        console.log('Hashes match, skipping npm ci/install');
-                        return;
-                    }
-                    else {
-                        if (verbose) {
-                            console.log(`Hashes do not match: existing ${existingHash} new ${fullHash}, proceeding with npm ci/install`);
-                        }
-                    }
-                }
-                catch (e) {
-                    // ignore
-                    if (verbose) {
-                        console.log('Hash file does not exist, proceeding with npm ci/install');
-                    }
-                }
-                yield this.runNpmShell({ command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH });
-                let customPackgeNames = [];
-                if (usersPackage && usersLock) {
-                    customPackgeNames = [
-                        ...Object.keys(usersPackage.dependencies || []),
-                        ...Object.keys(usersPackage.devDependencies || [])
-                    ].reduce((acc, packageName) => {
-                        const version = usersLock.packages[`node_modules/${packageName}`].version;
-                        acc.push(`${packageName}@${version}`);
-                        return acc;
-                    }, []);
+            }
+            const iconPackagesNamesHash = hashify(iconPackageNames);
+            const fullHash = `${spaLockHash}::${iconPackagesNamesHash}::${usersLockHash}`;
+            const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
+            try {
+                const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
+                if (existingHash === fullHash) {
+                    process.env.HEAVY_DEBUG && console.log(`🪲Hashes match, skipping npm ci/install, from file: ${existingHash}, actual: ${fullHash}`);
+                    return;
                 }
-                if (iconPackageNames.length) {
-                    const npmInstallCommand = `install ${[...iconPackageNames, ...customPackgeNames].join(' ')}`;
-                    yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
+                else {
+                    process.env.HEAVY_DEBUG && console.log(`🪲 Hashes do not match: from file: ${existingHash} actual: ${fullHash}, proceeding with npm ci/install`);
                 }
-                yield fs.promises.writeFile(hashPath, fullHash);
             }
+            catch (e) {
+                // ignore
+                process.env.HEAVY_DEBUG && console.log('🪲Hash file does not exist, proceeding with npm ci/install');
+            }
+            yield this.runNpmShell({ command: 'ci', cwd: CodeInjector.SPA_TMP_PATH });
+            let customPackgeNames = [];
+            if (usersPackage && usersLock) {
+                customPackgeNames = [
+                    ...Object.keys(usersPackage.dependencies || []),
+                    ...Object.keys(usersPackage.devDependencies || [])
+                ].reduce((acc, packageName) => {
+                    const version = usersLock.packages[`node_modules/${packageName}`].version;
+                    acc.push(`${packageName}@${version}`);
+                    return acc;
+                }, []);
+            }
+            if (iconPackageNames.length) {
+                const npmInstallCommand = `install ${[...iconPackageNames, ...customPackgeNames].join(' ')}`;
+                yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
+            }
+            yield fs.promises.writeFile(hashPath, fullHash);
         });
     }
     watchForReprepare(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ verbose }) {
+        return __awaiter(this, arguments, void 0, function* ({}) {
             const spaPath = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa');
             // get list of all subdirectories in spa recursively
             const directories = [];
@@ -456,7 +450,7 @@ class CodeInjector {
         });
     }
     watchCustomComponentsForCopy(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ verbose, customComponentsDir, destination }) {
+        return __awaiter(this, arguments, void 0, function* ({ customComponentsDir, destination }) {
             if (!customComponentsDir) {
                 return;
             }
@@ -465,9 +459,7 @@ class CodeInjector {
                 yield fs.promises.access(customComponentsDir, fs.constants.F_OK);
             }
             catch (e) {
-                if (verbose) {
-                    console.log(`Custom components dir ${customComponentsDir} does not exist, skipping watching`);
-                }
+                process.env.HEAVY_DEBUG && console.log(`🪲Custom components dir ${customComponentsDir} does not exist, skipping watching`);
                 return;
             }
             // get all subdirs
@@ -520,16 +512,15 @@ class CodeInjector {
         });
     }
     bundleNow(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ hotReload = false, verbose = false }) {
+        return __awaiter(this, arguments, void 0, function* ({ hotReload = false }) {
             console.log(`AdminForth bundling ${hotReload ? ' and listening for changes (🔥 Hotreload)' : ' (no hot reload)'}`);
             this.adminforth.runningHotReload = hotReload;
-            yield this.prepareSources({ verbose });
+            yield this.prepareSources({});
             if (hotReload) {
                 yield Promise.all([
-                    this.watchForReprepare({ verbose }),
+                    this.watchForReprepare({}),
                     ...Object.entries(this.srcFoldersToSync).map((_b) => __awaiter(this, [_b], void 0, function* ([src, dest]) {
                         yield this.watchCustomComponentsForCopy({
-                            verbose,
                             customComponentsDir: src,
                             destination: dest,
                         });
@@ -540,11 +531,11 @@ class CodeInjector {
             const cwd = CodeInjector.SPA_TMP_PATH;
             if (!hotReload) {
                 // probably add option to build with tsh check (plain 'build')
-                yield this.runNpmShell({ command: 'run build-only', verbose, cwd });
+                yield this.runNpmShell({ command: 'run build-only', cwd });
             }
             else {
                 const command = 'run dev';
-                console.log(`⚙️ Running npm ${command}...`);
+                console.log(`⚙️ spawn: npm ${command}...`);
                 const nodeBinary = process.execPath;
                 const npmPath = path.join(path.dirname(nodeBinary), 'npm');
                 const env = Object.assign({ VITE_ADMINFORTH_PUBLIC_PATH: this.adminforth.config.baseUrl, FORCE_COLOR: '1' }, process.env);

package/dist/modules/restApi.js

@@ -339,15 +339,6 @@ export default class AdminForthRestAPI {
                         item[col.name] = targetDataMap[item[col.name]];
                     });
                 })));
-                for (const hook of listify((_t = (_s = resource.hooks) === null || _s === void 0 ? void 0 : _s[source]) === null || _t === void 0 ? void 0 : _t.afterDatasourceResponse)) {
-                    const resp = yield hook({ resource, response: data.data, adminUser });
-                    if (!resp || (!resp.ok && !resp.error)) {
-                        throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
-                    }
-                    if (resp.error) {
-                        return { error: resp.error };
-                    }
-                }
                 // remove all columns which are not defined in resources, or defined but backendOnly
                 data.data.forEach((item) => {
                     Object.keys(item).forEach((key) => {
@@ -359,6 +350,16 @@ export default class AdminForthRestAPI {
                 data.data.forEach((item) => {
                     item._label = resource.recordLabel(item);
                 });
+                // only after adminforth made all post processing, give user ability to edit it
+                for (const hook of listify((_t = (_s = resource.hooks) === null || _s === void 0 ? void 0 : _s[source]) === null || _t === void 0 ? void 0 : _t.afterDatasourceResponse)) {
+                    const resp = yield hook({ resource, response: data.data, adminUser });
+                    if (!resp || (!resp.ok && !resp.error)) {
+                        throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
+                    }
+                    if (resp.error) {
+                        return { error: resp.error };
+                    }
+                }
                 return Object.assign(Object.assign({}, data), { options: resource === null || resource === void 0 ? void 0 : resource.options });
             }),
         });

package/dist/spa/spa/src/stores/user.ts

@@ -28,8 +28,7 @@ export const useUserStore = defineStore('user', () => {
         await router.isReady();
         await coreStore.fetchMenuAndResource();
         setTimeout(() => {
-                initFlowbite();
-
+            initFlowbite();
         }); 
     }
 

package/index.ts

@@ -138,8 +138,8 @@ class AdminForth implements IAdminForth {
     // console.log('⚙️⚙️⚙️ Database discovery done', JSON.stringify(this.config.resources, null, 2));
   }
 
-  async bundleNow({ hotReload=false, verbose=false }) {
-    await this.codeInjector.bundleNow({ hotReload, verbose });
+  async bundleNow({ hotReload=false }) {
+    await this.codeInjector.bundleNow({ hotReload });
   }
 
   async getUserByPk(pk: string) {

package/modules/codeInjector.ts

@@ -62,7 +62,7 @@ class CodeInjector implements ICodeInjector {
 
   }
 
-  // async runShell({command, verbose = false}) {
+  // async runShell({ command }) {
   //   console.log(`⚙️ Running shell ${command}...`);
   //   console.time(`${command} done in`);
   //   const { stdout: out, stderr: err } = await execAsync(command);
@@ -70,7 +70,7 @@ class CodeInjector implements ICodeInjector {
   //   console.log(`Command ${command} output:`, out, err);
   // }
 
-  async runNpmShell({command, verbose = false, cwd}) {
+  async runNpmShell({command, cwd}) {
     const nodeBinary = process.execPath; // Path to the Node.js binary running this script
     const npmPath = path.join(path.dirname(nodeBinary), 'npm'); // Path to the npm executable
 
@@ -80,7 +80,7 @@ class CodeInjector implements ICodeInjector {
       ...process.env,
     };
 
-    console.log(`⚙️ Running npm ${command}...`);
+    console.log(`⚙️ exec: npm ${command}...`);
     console.time(`npm ${command} done in`);
     const { stdout: out, stderr: err } = await execAsync(`${nodeBinary} ${npmPath} ${command}`, {
       cwd,
@@ -88,11 +88,9 @@ class CodeInjector implements ICodeInjector {
     });
     console.timeEnd(`npm ${command} done in`);
 
-    if (verbose) {
-      console.log(`npm ${command} output:`, out);
-    }
+    process.env.HEAVY_DEBUG && console.log(`🪲 npm ${command} output:`, out);
     if (err) {
-      console.error(`npm ${command} errors/warnings:`, err);
+      process.env.HEAVY_DEBUG && console.error(`🪲npm ${command} errors/warnings:`, err);
     }
   }
 
@@ -105,7 +103,7 @@ class CodeInjector implements ICodeInjector {
     }
   }
 
-  async prepareSources({ filesUpdated, verbose = false }: { filesUpdated?: string[], verbose?: boolean }) {
+  async prepareSources({ filesUpdated }: { filesUpdated?: string[] }) {
     // check SPA_TMP_PATH exists and create if not
     try {
       await fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
@@ -386,7 +384,6 @@ class CodeInjector implements ICodeInjector {
     await fs.promises.writeFile(indexHtmlPath, indexHtmlContent);
 
 
-
     /* generate custom routes */
     const homepageMenuItem = this.adminforth.config.menu.find((mi)=>mi.homepage);
     let childrenHomePageMenuItem = this.adminforth.config.menu.find((mi)=>mi.children && mi.children?.find((mi)=>mi.homepage));
@@ -414,9 +411,10 @@ class CodeInjector implements ICodeInjector {
     /* customPackageLock */
     let usersLockHash = '';
     let usersLock = null;
+    let usersPackage = null;
+
     if (this.adminforth.config.customization?.customComponentsDir) {
       const usersPackagePath = path.join(this.adminforth.config.customization.customComponentsDir, 'package.json');
-      let usersPackage = null;
       try {
         usersPackage = JSON.parse(await fs.promises.readFile(usersPackagePath, 'utf-8'));
       } catch (e) {
@@ -432,6 +430,7 @@ class CodeInjector implements ICodeInjector {
         }
         usersLockHash = hashify(usersLock);
       }
+    }
 
     const iconPackagesNamesHash = hashify(iconPackageNames);
 
@@ -441,21 +440,17 @@ class CodeInjector implements ICodeInjector {
     try {
       const existingHash = await fs.promises.readFile(hashPath, 'utf-8');
       if (existingHash === fullHash) {
-        console.log('Hashes match, skipping npm ci/install');
+        process.env.HEAVY_DEBUG && console.log(`🪲Hashes match, skipping npm ci/install, from file: ${existingHash}, actual: ${fullHash}`);
         return;
       } else {
-        if (verbose) {
-          console.log(`Hashes do not match: existing ${existingHash} new ${fullHash}, proceeding with npm ci/install`);
-        }
+        process.env.HEAVY_DEBUG && console.log(`🪲 Hashes do not match: from file: ${existingHash} actual: ${fullHash}, proceeding with npm ci/install`);
       }
     } catch (e) {
       // ignore
-      if (verbose) {
-        console.log('Hash file does not exist, proceeding with npm ci/install');
-      }
+      process.env.HEAVY_DEBUG && console.log('🪲Hash file does not exist, proceeding with npm ci/install');
     }
 
-    await this.runNpmShell({command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH});
+    await this.runNpmShell({command: 'ci', cwd: CodeInjector.SPA_TMP_PATH});
 
     let customPackgeNames = [];
     if (usersPackage && usersLock) {
@@ -477,11 +472,9 @@ class CodeInjector implements ICodeInjector {
     }
 
     await fs.promises.writeFile(hashPath, fullHash);
-
   }
-}
 
-async watchForReprepare({ verbose }) {
+async watchForReprepare({}) {
     const spaPath = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa');
     // get list of all subdirectories in spa recursively
     const directories = [];
@@ -519,7 +512,7 @@ async watchForReprepare({ verbose }) {
     this.allWatchers.push(watcher);
   }
 
-  async watchCustomComponentsForCopy({ verbose, customComponentsDir, destination }) {
+  async watchCustomComponentsForCopy({ customComponentsDir, destination }) {
     if (!customComponentsDir) {
       return;
     }
@@ -527,9 +520,7 @@ async watchForReprepare({ verbose }) {
     try {
       await fs.promises.access(customComponentsDir, fs.constants.F_OK);
     } catch (e) {
-      if (verbose) {
-        console.log(`Custom components dir ${customComponentsDir} does not exist, skipping watching`);
-      }
+      process.env.HEAVY_DEBUG && console.log(`🪲Custom components dir ${customComponentsDir} does not exist, skipping watching`);
       return;
     }
 
@@ -594,19 +585,18 @@ async watchForReprepare({ verbose }) {
     this.allWatchers.push(watcher);
   }
 
-  async bundleNow({hotReload = false, verbose = false}: {hotReload: boolean, verbose: boolean}) {
+  async bundleNow({ hotReload = false }: { hotReload: boolean }) {
     console.log(`AdminForth bundling ${hotReload ? ' and listening for changes (🔥 Hotreload)' : ' (no hot reload)'}`);
     this.adminforth.runningHotReload = hotReload;
 
-    await this.prepareSources({ verbose });
+    await this.prepareSources({});
 
     if (hotReload) {
       await Promise.all([
-        this.watchForReprepare({ verbose }),
+        this.watchForReprepare({}),
         ...Object.entries(this.srcFoldersToSync).map(async ([src, dest]) => {
 
           await this.watchCustomComponentsForCopy({ 
-            verbose, 
             customComponentsDir: src,
             destination: dest,
           });
@@ -620,10 +610,10 @@ async watchForReprepare({ verbose }) {
 
     if (!hotReload) {
       // probably add option to build with tsh check (plain 'build')
-      await this.runNpmShell({command: 'run build-only', verbose, cwd});
+      await this.runNpmShell({command: 'run build-only', cwd});
     } else {
       const command = 'run dev';
-      console.log(`⚙️ Running npm ${command}...`);
+      console.log(`⚙️ spawn: npm ${command}...`);
       const nodeBinary = process.execPath; 
       const npmPath = path.join(path.dirname(nodeBinary), 'npm');
       const env = {

package/modules/restApi.ts

@@ -391,17 +391,6 @@ export default class AdminForthRestAPI {
           })
         );
 
-        for (const hook of listify(resource.hooks?.[source]?.afterDatasourceResponse)) {
-          const resp = await hook({ resource, response: data.data, adminUser });
-          if (!resp || (!resp.ok && !resp.error)) {
-            throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
-          }
-
-          if (resp.error) {
-            return { error: resp.error };
-          }
-        }
-
         // remove all columns which are not defined in resources, or defined but backendOnly
         data.data.forEach((item) => {
           Object.keys(item).forEach((key) => {
@@ -415,6 +404,18 @@ export default class AdminForthRestAPI {
           item._label = resource.recordLabel(item);
         });
 
+        // only after adminforth made all post processing, give user ability to edit it
+        for (const hook of listify(resource.hooks?.[source]?.afterDatasourceResponse)) {
+          const resp = await hook({ resource, response: data.data, adminUser });
+          if (!resp || (!resp.ok && !resp.error)) {
+            throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
+          }
+
+          if (resp.error) {
+            return { error: resp.error };
+          }
+        }
+
         return {
           ...data, 
           options: resource?.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/stores/user.ts

@@ -28,8 +28,7 @@ export const useUserStore = defineStore('user', () => {
         await router.isReady();
         await coreStore.fetchMenuAndResource();
         setTimeout(() => {
-                initFlowbite();
-
+            initFlowbite();
         }); 
     }