feat: rework view engine

Author: mychidarko

src/Core.php

@@ -64,6 +64,27 @@ public static function loadApplicationConfig()
                 \Leaf\Vite::config('build', 'public/build');
                 \Leaf\Vite::config('hotFile', 'public/hot');
             }
+
+            Config::attachView(ViewConfig('viewEngine'), 'template');
+
+            if (ViewConfig('config')) {
+                call_user_func_array(ViewConfig('config'), [
+                    app()->template(),
+                    [
+                        'views' => AppConfig('views.path'),
+                        'cache' => AppConfig('views.cachePath'),
+                    ]
+                ]);
+            } else if (method_exists(app()->template(), 'configure')) {
+                app()->template()->configure([
+                    'views' => AppConfig('views.path'),
+                    'cache' => AppConfig('views.cachePath'),
+                ]);
+            }
+
+            if (is_callable(ViewConfig('extend'))) {
+                call_user_func_array(ViewConfig('extend'), app()->template());
+            }
         }
     }
 
@@ -79,12 +100,12 @@ protected static function loadConfig()
                 'app.down' => _env('APP_DOWN', false),
                 'debug' => _env('APP_DEBUG', true),
                 'log.dir' => 'storage/logs/',
-                'log.enabled' => true,
+                'log.enabled' => _env('APP_LOG_ENABLED', true),
                 'log.file' => 'app.log',
                 'log.level' => Log::DEBUG,
                 'log.open' => true,
                 'log.writer' => null,
-                'mode' => 'development',
+                'mode' => _env('APP_ENV', 'development'),
                 'views.path' => ViewsPath(null, false),
                 'views.cachePath' => StoragePath('framework/views')
             ],
@@ -95,11 +116,11 @@ protected static function loadConfig()
                 'timestamps.format' => 'YYYY-MM-DD HH:mm:ss',
                 'unique' => ['email'],
                 'hidden' => ['field.id', 'field.password'],
-                'session' => true,
+                'session' => _env('AUTH_SESSION', true),
                 'session.lifetime' => 60 * 60 * 24,
                 'session.cookie' => ['secure' => false, 'httponly' => true, 'samesite' => 'lax'],
                 'token.lifetime' => 60 * 60 * 24 * 365,
-                'token.secret' => _env('TOKEN_SECRET', '@leaf$MVC*JWT#AUTH.Secret'),
+                'token.secret' => _env('AUTH_TOKEN_SECRET', '@leaf$MVC*JWT#AUTH.Secret'),
                 'messages.loginParamsError' => 'Incorrect credentials!',
                 'messages.loginPasswordError' => 'Password is incorrect!',
                 'password.key' => 'password',
@@ -111,10 +132,10 @@ protected static function loadConfig()
                 },
             ],
             'cors' => [
-                'origin' => '*',
-                'methods' => 'GET,HEAD,PUT,PATCH,POST,DELETE',
-                'allowedHeaders' => '*',
-                'exposedHeaders' => '',
+                'origin' => _env('CORS_ALLOWED_ORIGINS', '*'),
+                'methods' => _env('CORS_ALLOWED_METHODS', 'GET,HEAD,PUT,PATCH,POST,DELETE'),
+                'allowedHeaders' => _env('CORS_ALLOWED_HEADERS', '*'),
+                'exposedHeaders' => _env('CORS_EXPOSED_HEADERS', ''),
                 'credentials' => false,
                 'maxAge' => null,
                 'preflightContinue' => false,
@@ -188,10 +209,11 @@ protected static function loadConfig()
             ],
             'view' => [
                 'viewEngine' => \Leaf\Blade::class,
-                'render' => null,
-                'config' => function ($config) {
-                    \Leaf\Config::get('views.blade')->configure($config['views'], $config['cache']);
+                'config' => function ($engine, $config) {
+                    $engine->configure($config['views'], $config['cache']);
                 },
+                'render' => null,
+                'extend' => null,
             ],
             'mail' => [
                 'host' => _env('MAIL_HOST', 'smtp.mailtrap.io'),

src/globals/functions.php

@@ -22,54 +22,7 @@ function assets($assets = '')
      */
     function view(string $view, $data = [])
     {
-        /// WILL REFACTOR IN NEXT VERSION
-
-        if (is_object($data)) {
-            $data = (array) $data;
-        }
-
-        if (ViewConfig('render')) {
-            if (ViewConfig('config')) {
-                call_user_func_array(ViewConfig('config'), [[
-                    'views' => AppConfig('views.path'),
-                    'cache' => AppConfig('views.cachePath'),
-                ]]);
-            }
-
-            return ViewConfig('render')($view, $data);
-        }
-
-        $engine = ViewConfig('viewEngine');
-        $className = strtolower(get_class(new $engine));
-
-        $fullName = explode('\\', $className);
-        $className = $fullName[count($fullName) - 1];
-
-        if (\Leaf\Config::getStatic("views.$className")) {
-            if (ViewConfig('config')) {
-                call_user_func_array(ViewConfig('config'), [[
-                    'views' => AppConfig('views.path'),
-                    'cache' => AppConfig('views.cachePath'),
-                ]]);
-            } else {
-                \Leaf\Config::get("views.$className")->configure(AppConfig('views.path'), AppConfig('views.cachePath'));
-            }
-
-            return \Leaf\Config::get("views.$className")->render($view, $data);
-        }
-
-        $engine = new $engine($engine);
-
-        if (ViewConfig('config')) {
-            call_user_func_array(ViewConfig('config'), [[
-                'views' => AppConfig('views.path'),
-                'cache' => AppConfig('views.cachePath'),
-            ]]);
-        } else {
-            $engine->config(AppConfig('views.path'), AppConfig('views.cachePath'));
-        }
-
-        return $engine->render($view, $data);
+        return app()->template()->render($view, $data);
     }
 }