adminizer 4.4.0-build.160 → 4.4.0-build.161

package/helpers/configHelper.d.ts

@@ -21,7 +21,7 @@ export declare class ConfigHelper {
      * Get configured `identifierField` from adminpanel configuration.
      *
      * If not configured and model passed try to guess it using `primaryKey` field in model.
-     * If system couldn't guess will return 'id`.
+     * If system couldn't guess will return 'id'.
      * Model could be object or just name (string).
      *
      * **Warning** If you will pass record - method will return 'id'
@@ -46,4 +46,12 @@ export declare class ConfigHelper {
      * @returns Normalized field configuration or `false` if the field should be hidden
      */
     normalizeFieldConfig(adminizer: Adminizer, config: string | boolean | BaseFieldConfig, key: string, modelField: Attribute): false | BaseFieldConfig;
+    /**
+     * Normalizes the entire adminpanel configuration.
+     * Merges custom config with default config and handles normalization.
+     *
+     * @param config The custom config object
+     * @returns The normalized and merged config
+     */
+    static normalizeConfig(config: AdminpanelConfig): AdminpanelConfig;
 }

package/helpers/configHelper.js

@@ -1,3 +1,4 @@
+import { getDefaultConfig } from "../system/defaults.js";
 export class ConfigHelper {
     adminizer;
     constructor(adminizer) {
@@ -20,7 +21,7 @@ export class ConfigHelper {
      * Get configured `identifierField` from adminpanel configuration.
      *
      * If not configured and model passed try to guess it using `primaryKey` field in model.
-     * If system couldn't guess will return 'id`.
+     * If system couldn't guess will return 'id'.
      * Model could be object or just name (string).
      *
      * **Warning** If you will pass record - method will return 'id'
@@ -115,6 +116,40 @@ export class ConfigHelper {
         }
         return false;
     }
+    /**
+     * Normalizes the entire adminpanel configuration.
+     * Merges custom config with default config and handles normalization.
+     *
+     * @param config The custom config object
+     * @returns The normalized and merged config
+     */
+    static normalizeConfig(config) {
+        const defaultConfig = getDefaultConfig();
+        const { forms: configForms = {}, ...restConfig } = config;
+        const { forms: defaultForms = {}, } = defaultConfig;
+        const mergedConfig = {
+            ...defaultConfig,
+            ...restConfig,
+            models: {
+                ...defaultConfig.models,
+                ...config.models
+            },
+            forms: {
+                path: configForms.path ?? defaultForms.path,
+                data: {
+                    ...defaultForms.data,
+                    ...configForms.data
+                },
+                get: configForms.get ?? defaultForms.get,
+                set: configForms.set ?? defaultForms.set
+            }
+        };
+        // Normalize auth config if it's a boolean
+        if (typeof mergedConfig.auth === 'boolean') {
+            mergedConfig.auth = { enable: mergedConfig.auth };
+        }
+        return mergedConfig;
+    }
 }
 /**
  * function to determine the display field for associations.

package/lib/Adminizer.js

@@ -157,27 +157,8 @@ export class Adminizer {
         if (this.config && Object.keys(this.config).length > 0) {
             throw new Error("Config has already been initialized");
         }
-        // Merge custom config with default, additionally merge models
-        const defaultConfig = getDefaultConfig();
-        const { forms: configForms = {}, ...restConfig } = config;
-        const { forms: defaultForms = {}, } = defaultConfig;
-        this.config = {
-            ...defaultConfig,
-            ...restConfig,
-            models: {
-                ...defaultConfig.models,
-                ...config.models
-            },
-            forms: {
-                path: configForms.path ?? defaultForms.path,
-                data: {
-                    ...defaultForms.data,
-                    ...configForms.data
-                },
-                get: configForms.get ?? defaultForms.get,
-                set: configForms.set ?? defaultForms.set
-            }
-        };
+        // Normalize and merge config
+        this.config = ConfigHelper.normalizeConfig(config);
         // Bind cors
         bindCors(this);
         // set cookie parser

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.4.0-build.160",
+  "version": "4.4.0-build.161",
   "main": "index.js",
   "exports": {
     ".": "./index.js",