adminforth 1.1.7 → 1.1.9

package/dist/index.js

@@ -67,11 +67,14 @@ class AdminForth {
         if (!component) {
             return component;
         }
-        let obj = component;
-        if (typeof obj === 'string') {
+        let obj;
+        if (typeof component === 'string') {
             obj = { file: component, meta: {} };
         }
-        errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+        else {
+            obj = component;
+        }
+        errors.push(...this.checkCustomFileExists(obj.file));
         return obj;
     }
     validateConfig() {

package/dist/modules/codeInjector.js

@@ -41,18 +41,11 @@ class CodeInjector {
         this.allComponentNames = {};
         this.srcFoldersToSync = {};
         this.adminforth = adminforth;
-        process.on('SIGINT', () => {
-            console.log('Received SIGINT.');
+        ['SIGINT', 'SIGTERM', 'SIGQUIT']
+            .forEach(signal => process.on(signal, () => {
             this.cleanup();
-        });
-        process.on('SIGTERM', () => {
-            console.log('Received SIGTERM.');
-            this.cleanup();
-        });
-        process.on('exit', () => {
-            console.log('Exiting.');
-            this.cleanup();
-        });
+            process.exit();
+        }));
     }
     // async runShell({command, verbose = false}) {
     //   console.log(`⚙️ Running shell ${command}...`);

package/index.ts

@@ -9,7 +9,7 @@ import ExpressServer from './servers/express.js';
 import {v1 as uuid} from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION } from './modules/utils.js';
-import { AdminForthConfig, AdminForthClass, AdminForthComponentDeclaration,
+import { AdminForthConfig, AdminForthClass, AdminForthComponentDeclaration, AdminForthComponentDeclarationFull,
   AdminForthFilterOperators, AdminForthDataTypes, AdminForthResourcePages } from './types/AdminForthConfig.js';
 import { getFunctionList } from './modules/utils.js';
 import path from 'path';
@@ -87,11 +87,13 @@ class AdminForth implements AdminForthClass {
     if (!component) {
       return component;
     }
-    let obj: AdminForthComponentDeclaration = component;
-    if (typeof obj === 'string') {
-      obj = { file: component, meta: {} } as AdminForthComponentDeclaration;
+    let obj: AdminForthComponentDeclarationFull;
+    if (typeof component === 'string') {
+      obj = { file: component, meta: {} };
+    } else {
+      obj = component;
     }
-    errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+    errors.push(...this.checkCustomFileExists(obj.file));
     
     return obj;
   }

package/modules/codeInjector.ts

@@ -48,20 +48,12 @@ class CodeInjector implements CodeInjectorType {
   constructor(adminforth) {
     this.adminforth = adminforth;
 
-    process.on('SIGINT', () => {
-      console.log('Received SIGINT.');
-      this.cleanup(); 
-    });
-    
-    process.on('SIGTERM', () => {
-      console.log('Received SIGTERM.');
-      this.cleanup();
-    });
+    ['SIGINT', 'SIGTERM', 'SIGQUIT']
+      .forEach(signal => process.on(signal, () => {
+        this.cleanup();
+        process.exit();
+      }));
 
-    process.on('exit', () => {
-      console.log('Exiting.');
-      this.cleanup();
-    });
   }
 
   // async runShell({command, verbose = false}) {

package/package.json

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

package/types/AdminForthConfig.ts

@@ -802,7 +802,7 @@ export type ValidationObject = {
     message: string,
   }
 
-export type AdminForthComponentDeclaration = {
+export type AdminForthComponentDeclarationFull = {
   /**
    * Path to custom component which will be used to render field in the admin panel.
    * e.g. `@@/MyCustomComponent.vue`
@@ -858,7 +858,9 @@ export type AdminForthComponentDeclaration = {
    * 
    */
   meta?: any,
-} | string;
+}
+
+export type AdminForthComponentDeclaration = AdminForthComponentDeclarationFull | string;
 
 export type AdminForthFieldComponents = {
     /**