adminforth 1.1.8 → 1.1.10

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() {
@@ -310,20 +313,14 @@ class AdminForth {
         for (const resource of this.config.resources) {
             for (const column of resource.columns) {
                 if (column.components) {
-                    Object.entries(column.components).forEach(([key, comp]) => {
-                        column.components[key] = this.validateComponent(comp, errors);
-                    });
                     console.log('🔧🔧🔧 Validating components for resource', column.components);
-                    for (const [key, { file }] of Object.entries(column.components)) {
-                        if (this.codeInjector.allComponentNames[file]) {
+                    for (const comp of Object.values(column.components)) {
+                        if (this.codeInjector.allComponentNames[comp.file]) {
                             // not obvious, but if we are in this if, it means that this is plugin component
                             // and there is no sense to check if it exists in users folder
                             continue;
                         }
-                        const path = file.replace('@@', this.config.customization.customComponentsDir);
-                        if (!fs.existsSync(path)) {
-                            throw new Error(`Component file ${path} does not exist`);
-                        }
+                        this.validateComponent(comp, errors);
                     }
                 }
             }

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;
   }
@@ -369,21 +371,15 @@ class AdminForth implements AdminForthClass {
     for (const resource of this.config.resources) {
       for (const column of resource.columns) {
           if (column.components) {
-            Object.entries(column.components).forEach(([key, comp]) => {
-              column.components[key] = this.validateComponent(comp, errors);
-            });
             console.log('🔧🔧🔧 Validating components for resource', column.components);
 
-            for (const [key, { file }] of Object.entries(column.components as {any})) {
-                if (this.codeInjector.allComponentNames[file]) {
-                  // not obvious, but if we are in this if, it means that this is plugin component
-                  // and there is no sense to check if it exists in users folder
-                  continue;
-                }
-                const path = file.replace('@@', this.config.customization.customComponentsDir);
-                if (!fs.existsSync(path)) {
-                    throw new Error(`Component file ${path} does not exist`);
+            for (const comp of Object.values(column.components) as Array<AdminForthComponentDeclarationFull>) {
+                if (this.codeInjector.allComponentNames[comp.file]) {
+                    // not obvious, but if we are in this if, it means that this is plugin component
+                    // and there is no sense to check if it exists in users folder
+                    continue;
                 }
+                this.validateComponent(comp, errors);
             }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "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 = {
     /**