- quickfix

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "mcnd/lean",
-    "description": "A more-than-micro framework for basic apps",
+    "description": "A micro framework for rapid application development (RAD)",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -21,11 +21,9 @@
         "laminas/laminas-httphandlerrunner": "2.5.x-dev",
         "vlucas/phpdotenv": "^3.4@dev",
         "middlewares/whoops": "dev-master",
-        "ralouphie/getallheaders": "dev-master",
+        "guzzlehttp/guzzle": "^7@dev",
-        "guzzlehttp/guzzle": "^6.3@dev",
         "swiftmailer/swiftmailer": "^6.2@dev",
         "mcnd/storage": "dev-master",
-        "mcnd/lean": "dev-master",
         "mcnd/lean-console": "dev-master",
         "mcnd/ulmus": "dev-master",
         "mcnd/picea": "dev-master",
@@ -135,5 +133,29 @@
         "post-update-cmd": [
             "Lean\\Composer::postUpdate"
         ]
+    },
+    "extra" : {
+        "lean" : {
+            "autoload": {
+                "definitions" : [
+                    "meta/definitions/software.php",
+                    "meta/definitions/authorize.php",
+                    "meta/definitions/cli.php",
+                    "meta/definitions/cronard.php",
+                    "meta/definitions/email.php",
+                    "meta/definitions/event.php",
+                    "meta/definitions/http.php",
+                    "meta/definitions/language.php",
+                    "meta/definitions/negundo.php",
+                    "meta/definitions/routes.php",
+                    "meta/definitions/software.php",
+                    "meta/definitions/storage.php",
+                    "meta/definitions/template.php"
+                ],
+                "config": [
+                    "meta/config.php"
+                ]
+            }
+        }
     }
 }

meta/config.php

@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'ulmus' => [
+        'connections' => [
+            'sqlite' => [
+                'adapter'  => 'SQLite',
+                'path'     => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . "var/lean.sqlite3",
+                'pragma_begin' => "journal_mode=WAL",
+                'pragma_close' => "analysis_limit=500,optimize",
+            ],
+        ],
+    ],
+];

meta/definitions/authorize.php

@@ -0,0 +1,46 @@
+<?php
+
+use Lean\Factory\HttpFactory;
+
+use Ulmus\User\{Entity,
+    Lib\Authenticate,
+    Middleware\HeaderAuthenticationMiddleware,
+    Middleware\PostRequestAuthenticationMiddleware,
+    Authorize\PostRequestAuthentication};
+
+use Picea\Picea;
+
+use Storage\{ Cookie, Session };
+
+use function DI\{get, autowire, create};
+
+return [
+    Authenticate::class => create(Authenticate::class)->constructor(get(Entity\UserInterface::class), get(Session::class), get(Cookie::class), get('authentication.method')),
+
+    HeaderAuthenticationMiddleware::class => create(HeaderAuthenticationMiddleware::class)->constructor(get(Entity\UserInterface::class), get('authorize.error')),
+
+    PostRequestAuthentication::class => create(PostRequestAuthentication::class)->constructor(get(\Ulmus\User\Lib\Authenticate::class), "email", "email", "password"),
+
+    PostRequestAuthenticationMiddleware::class => create(PostRequestAuthenticationMiddleware::class)->constructor(get(Entity\UserInterface::class), get('authentication.error'), get(PostRequestAuthentication::class)),
+
+    'authentication.method' => null,
+
+    'authorize.error' => function($c) {
+        return function(array $errorData) {
+            return HttpFactory::createJsonResponse($errorData + [
+                'api.error' => "Authorization failed",
+                'api.datetime' => (new \DateTime)->format(\DateTime::ATOM),
+            ]);
+        };
+    },
+
+    'authentication.error' => function($c, Picea $picea) {
+        return function($message) use ($picea) {
+            return HttpFactory::createHtmlResponse($picea->renderHtml('lean/error/500', [
+                'title' => "Authentication failed",
+                'subtitle' => "",
+                'message' => $message,
+            ]));
+        };
+    },
+];

meta/definitions/cli.php

@@ -8,7 +8,7 @@ use Mcnd\CLI\CliMiddleware;
 
 use Notes\CLI\CommandFetcher;
 
-use Lean\Lean;
+use Lean\{ Factory, Lean };
 
 return [
     CommandFetcher::class => function($c) {
@@ -27,7 +27,7 @@ return [
 
     'cli.response:default' => function($c) {
         return function() {
-            return new \Laminas\Diactoros\Response\TextResponse("This is the default response from CLI middleware which indicates that no command were registered for this application.\n");
+            return Factory\HttpFactory::createTextResponse("This is the default response from CLI middleware which indicates that no command were registered for this application.\n");
         };
     },
 ];

meta/definitions/cronard.php

@@ -2,20 +2,18 @@
 
 use function DI\autowire, DI\create, DI\get;
 
-use Laminas\Diactoros\Response\HtmlResponse;
-
 use Cronard\CronardMiddleware,
     Notes\Cronard\TaskFetcher;
 
 use Psr\Http\Message\ResponseInterface;
 
-use Lean\Lean;
+use Lean\{ Factory, Lean };
 
 return [
     CronardMiddleware::class => function($c) {
         $cronardMiddleware = new CronardMiddleware($c, getenv('CRON_KEY'), function() : ResponseInterface {
-            return new HtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s')));
+            return Factory\HttpFactory::createHtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s')));
-        }, [], $c->get(TaskFetcher::class));
+        }, []);
 
         return $cronardMiddleware->fromFile(getenv("META_PATH")."/crontab.php")->fromAnnotations($c->get(TaskFetcher::class));
     },

meta/definitions/event.php

@@ -26,7 +26,7 @@ return [
     Event\EventDefinition::class => function($c) {
         return new Event\EventDefinition([
             new class() implements RoutingCompileRoutes {
-                public function execute(Routing $routing, Route|\Notes\Route\Annotation\Method\Route $attribute) : void
+                public function execute(Routing $routing, Route $attribute) : void
                 {
                     if (null !== ($name = $attribute->name ?? null)) {
                         $routing->extension->registerRoute($name, $attribute->getRoute(), $attribute->class, $attribute->classMethod, $attribute->methods ?? (array)$attribute->method);
@@ -35,7 +35,7 @@ return [
             },
 
             new class() implements RoutingMapRoutes {
-                public function execute(Routing $routing, ContainerInterface $container, ServerRequestInterface & $request, Route|\Notes\Route\Annotation\Method\Route $attribute) : void
+                public function execute(Routing $routing, ContainerInterface $container, ServerRequestInterface & $request, Route $attribute) : void
                 {
                     $class = $attribute->class;
                     $method = $attribute->classMethod;

meta/definitions/negundo.php

@@ -6,7 +6,7 @@ use Negundo\Client\{ SoftwareConfig, Dump, Task, NegundoMiddleware };
 
 return [
     SoftwareConfig::class => create(SoftwareConfig::class)->constructor(getenv('NEGUNDO_HASH'), getenv('NEGUNDO_SERVER')),
-    # NegundoMiddleware::class => create(NegundoMiddleware::class)->constructor(get(SoftwareConfig::class)),
+    NegundoMiddleware::class => autowire(NegundoMiddleware::class),
-    Dump::class => create(Dump::class)->constructor(get(SoftwareConfig::class)),
+    Dump::class => autowire(Dump::class),
-    Task::class => create(Task::class)->constructor(get(SoftwareConfig::class)),
+    Task::class => autowire(Task::class),
 ];

meta/definitions/routes.php

@@ -3,31 +3,23 @@
 use function DI\autowire, DI\create, DI\get;
 
 use League\Route\Strategy\ApplicationStrategy,
-    League\Route\Http\Exception\NotFoundException,
     League\Route\Router;
 
-use Psr\Http\Message\ResponseFactoryInterface,
+use Psr\Container\ContainerInterface;
-    Psr\Container\ContainerInterface,
-    Psr\Http\Message\ResponseInterface,
-    Psr\Http\Message\ServerRequestInterface,
-    Psr\Http\Server\MiddlewareInterface,
-    Psr\Http\Server\RequestHandlerInterface,
-    Psr\SimpleCache\CacheInterface;
-
-use TheBugs\JavascriptMiddleware;
 
 use Cronard\CronardMiddleware;
 
-use Tuupola\Middleware\HttpBasicAuthentication;
-
 use Notes\Route\RouteFetcher;
 
 use Notes\Breadcrumb\Breadcrumb;
 
-use Ulmus\User\Lib\Authenticate;
-
 use Storage\SessionMiddleware;
 
+use Ulmus\User\Middleware\{
+    HeaderAuthenticationMiddleware,
+    PostRequestAuthenticationMiddleware
+};
+
 return [
     Lean\Routing::class => autowire(Lean\Routing::class),
 
@@ -51,45 +43,28 @@ return [
         return $breadcrumb;
     },
 
-    ApplicationStrategy::class => function($c) {
+    ApplicationStrategy::class => autowire(\Lean\ApplicationStrategy::class),
-        return new class($c->get(Picea\Picea::class)) extends ApplicationStrategy {
 
-            public Picea\Picea $picea;
+    'routes.middlewares'  => [
+        "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, Mcnd\Event\EventMiddleware::class, Mcnd\CLI\CliMiddleware::class,
+    ],
 
-            public function __construct(Picea\Picea $picea) {
+    'app.middlewares' => [
-                $this->picea = $picea;
+        HeaderAuthenticationMiddleware::class,
-            }
+        PostRequestAuthenticationMiddleware::class,
-
+    ],
-            public function getNotFoundDecorator(NotFoundException $exception): MiddlewareInterface
-            {
-                return new class($this->picea) implements MiddlewareInterface {
-
-                    protected Picea\Picea $picea;
-
-                    public function __construct(Picea\Picea $picea) {
-                        $this->picea = $picea;
-                    }
-
-                    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-                    {
-                        return new Laminas\Diactoros\Response\HtmlResponse($this->picea->renderHtml("lean/error/404", [], $this), 404);
-                    }
-
-                };
-            }
-
-        };
-    },
-
-    'routes.middlewares'  => [ "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, Mcnd\Event\EventMiddleware::class, Mcnd\CLI\CliMiddleware::class,  ],
 
     'routes.list' => function($c) {
         return function (ContainerInterface $container) {
             $router = $container->get(Router::class);
 
-            foreach($container->get('routes.middlewares') as $i => $middleware) {
+            foreach([ 'routes.middlewares', 'app.middlewares' ] as $key) {
-                if ( $container->has($middleware) ) {
+                if ( $container->has($key) ) {
-                    $router->middleware($container->get($middleware));
+                    foreach ($container->get($key) as $i => $middleware) {
+                        if ($container->has($middleware)) {
+                            $router->middleware($container->get($middleware));
+                        }
+                    }
                 }
             }
 

meta/definitions/software.php

@@ -1,23 +1,18 @@
 <?php
 
+use Taxus\Privilege;
 use function DI\autowire, DI\create, DI\get;
 
-use Laminas\Diactoros\Response\HtmlResponse;
-
 use TheBugs\JavascriptMiddleware;
 
-
-use Cronard\CronardMiddleware,
-    Notes\Cronard\TaskFetcher;
-
 use Lean\Lean;
 
-use Psr\Http\Message\ResponseInterface;
-
 use Storage\Cookie,
     Storage\Session,
     Storage\SessionMiddleware;
 
+$dir = dirname(__DIR__, 2);
+
 return [
     'lean.default' => [
         'picea' => [
@@ -29,11 +24,18 @@ return [
                     'order' => 10,
                 ],
                 [
-                    'path' => getenv("PROJECT_PATH") . implode(DIRECTORY_SEPARATOR, [ "", "vendor", "mcnd" , "lean" , "view" ]),
+                    'path' => implode(DIRECTORY_SEPARATOR, [ $dir, "view", '' ]),
                     'order' => 99,
                 ],
             ],
 
+            'asset' => [
+                [
+                    'path' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), "asset", '' ]),
+                    'order' => 10
+                ]
+            ],
+
             'extensions' => [],
         ],
 
@@ -63,6 +65,13 @@ return [
         'routes' => [],
 
         'cronard' => [],
+
+        'taxus' => [
+            [ new Privilege("dev", "Is a developper of this application."), "is_dev" ],
+            [ new Privilege("admin", "Can manage mostly everything from this application."), "is_admin" ],
+            [ new Privilege("user", "Is an authenticated user."), "is_user" ],
+            [ new Privilege("anonymous", "Is an anonymous (unauthenticated) user."), "is_anonymous" ],
+        ]
     ],
 
     Lean::class => autowire(Lean::class),
@@ -83,11 +92,11 @@ return [
         $gitdir = getenv("PROJECT_PATH") . DIRECTORY_SEPARATOR . ".git" . DIRECTORY_SEPARATOR;
 
         if ( file_exists($gitdir . "HEAD") ) {
-            if (false !== ($currentBranch = file_get_contents($gitdir . "HEAD"))) {
+            if (false !== ($currentBranch = file_get_contents($gitdir  . "HEAD"))) {
                 $file = explode(": ", $currentBranch)[1];
                 $path = $gitdir . str_replace("/", DIRECTORY_SEPARATOR, trim($file, " \t\n\r"));
 
-                return trim(file_get_contents($path), " \t\n\r");
+                return file_exists($path) ? trim(file_get_contents($path), " \t\n\r") : null;
             }
         }
 

meta/definitions/storage.php

@@ -0,0 +1,19 @@
+<?php
+
+use Psr\Container\ContainerInterface;
+
+use Ulmus\ConnectionAdapter,
+    Ulmus\Container\AdapterProxy;
+
+use Storage\Session;
+
+use function DI\autowire, DI\create, DI\get;
+
+return [
+    'lean:adapter.sqlite' => function($c) {
+        $adapter = new ConnectionAdapter('sqlite', $c->get('config')['ulmus'], true);
+        $adapter->resolveConfiguration();
+
+        return $adapter;
+    }
+];

meta/definitions/template.php

@@ -2,24 +2,47 @@
 
 use function DI\autowire, DI\create, DI\get;
 
-use Laminas\Diactoros\Response\HtmlResponse;
+use Picea\{
+    Language\LanguageRegistration,
+    Caching\Cache,
+    Caching\Opcache,
+    Compiler,
+    Compiler\Context,
+    Compiler\BaseContext,
+    FileFetcher,
+    Method\Request};
+
+use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension };
 
-use Picea\{ Picea, Caching\Cache, Caching\Opcache, Compiler, Compiler\Context, Compiler\BaseContext, FileFetcher, Language\DefaultRegistrations, Method\Request };
-use Picea\Extension\{ LanguageHandler, LanguageExtension, TitleExtension, NumberExtension, UrlExtension };
 use Picea\Ui\{ Method, Ui };
-use Picea\Asset\Asset;
 
 return [
-    Picea::class => function($c) {
+    Picea\Picea::class => function($c) {
-        return new Picea($c->get(Context::class), $c->get(Cache::class), $c->get(Compiler::class), null, $c->get(FileFetcher::class), null, getenv("DEBUG"));
+        return new Picea\Picea($c->get(Context::class), $c->get(Cache::class), $c->get(Compiler::class), null, $c->get(FileFetcher::class), null, getenv("DEBUG"));
     },
 
     Context::class => function($c) {
-        return new BaseContext( $c->get(Lean\Lean::class)->getPiceaContext() );
+        return new BaseContext($c->get(Lean\Lean::class)->getPiceaContext());
     },
 
-    Compiler::class => function($c) {
+    Ui::class => autowire(Ui::class),
-        return new Compiler(new class(array_merge([
+
+    Compiler::class => autowire(Compiler::class),
+
+    Request::class => autowire(Request::class),
+
+    Method\Form::class => autowire(Method\Form::class),
+
+    Method\Pagination::class => autowire(Method\Pagination::class),
+
+    LanguageExtension::class => create(LanguageExtension::class)->constructor(get(LanguageHandlerInterface::class)),
+
+    LanguageHandlerInterface::class => autowire(\Lean\LanguageHandler::class),
+
+    LanguageRegistration::class => create(\Lean\PiceaDefaultRegistration::class)->constructor(get('picea.extensions'), [], [], get(Ui::class), null),
+
+    'picea.extensions' => function(\Psr\Container\ContainerInterface $c) {
+        return array_merge([
             $c->get(LanguageExtension::class),
             $c->get(TitleExtension::class),
             $c->get(NumberExtension::class),
@@ -28,43 +51,8 @@ return [
             $c->get(Method\Pagination::class),
             $c->get(Request::class),
         ], class_exists(\Taxus\Picea\Extension::class) ? [ $c->get(\Taxus\Picea\Extension::class) ] : [],
-            array_map(fn($class) => $c->get($class), $c->get(Lean\Lean::class)->getPiceaExtensions() ))) extends DefaultRegistrations {
+            array_map(fn($class) => $c->get($class), $c->get(Lean\Lean::class)->getPiceaExtensions())
-
+        );
-            public function registerAll(Compiler $compiler) : void
-            {
-                parent::registerAll($compiler);
-                ( new Ui() )->registerFormExtension($compiler);
-
-                if ( class_exists('Picea\\Asset\\Asset') ) {
-                    ( new Asset() )->registerExtension($compiler);
-
-                }
-            }
-
-        });
-    },
-
-    Request::class => autowire(Request::class),
-
-    Method\Form::class => autowire(Method\Form::class),
-
-    Method\Pagination::class => autowire(Method\Pagination::class),
-
-    LanguageExtension::class => create(LanguageExtension::class)->constructor(get(LanguageHandler::class)),
-
-    LanguageHandler::class => function($c) {
-        return new class( $c->get(Tell\I18n::class) ) implements LanguageHandler {
-            public Tell\I18n $tell;
-
-            public function __construct(Tell\I18n $tell) {
-                $this->tell = $tell;
-            }
-
-            public function languageFromKey(string $key, array $variables = []) #: array|string
-            {
-                return $this->tell->fromKey($key, $variables) ?: "";
-            }
-        };
     },
 
     TitleExtension::class => autowire(TitleExtension::class),

meta/i18n/en/lean.date.json

@@ -1,6 +1,10 @@
 {
-  "today": "today",
+
-  "week": "week",
+  "moment": {
+    "today": "today",
+    "week": "week"
+  },
+
   "month": {
     "list": [
       "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "Décember"

meta/i18n/fr/lean.date.json

@@ -1,6 +1,9 @@
 {
-  "today": "aujourd'hui",
+  "moment": {
-  "week": "semaine",
+    "today": "aujourd'hui",
+    "week": "semaine"
+  },
+
   "month": {
     "list": [
       "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"

skeleton/meta/config.php

@@ -31,11 +31,17 @@ return [
                 ],
             ],
 
-            #'sqlite' => [
+            'sqlite' => [
-            #    'adapter'  => getenv("SQLITE_ADAPTER"),
+                'adapter'  => getenv("SQLITE_ADAPTER"),
-            #    'path'     => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . getenv("SQLITE_PATH"),
+                'path'     => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . getenv("SQLITE_PATH"),
-            #    'pragma'   => explode(',', getenv("SQLITE_PRAGMA")),
+                'pragma'   => explode(',', getenv("SQLITE_PRAGMA")),
-            #],
+                'pragma_begin' => array_merge(
+                     explode(',', getenv("SQLITE_PRAGMA_BEGIN")), explode(',', getenv('DEBUG') ? getenv("SQLITE_PRAGMA_DEBUG_BEGIN") : "")
+                 ),
+                 'pragma_close' => array_merge(
+                     explode(',', getenv("SQLITE_PRAGMA_CLOSE")), explode(',', getenv('DEBUG') ? getenv("SQLITE_PRAGMA_DEBUG_CLOSE") : "")
+                 ),
+            ],
         ]
     ]
 ];

skeleton/meta/definitions/auth.php

@@ -22,27 +22,15 @@ use TheBugs\Email\{ EmailConfiguration, MailerInterface, SwiftMailer };
 use Taxus\{ Taxus, PermissionGrantInterface };
 
 return [
-    Entity\User::class => autowire(Entity\User::class),
+    \Ulmus\User\Entity\UserInterface::class => autowire(Entity\User::class),
-
-    Authenticate::class => create(Authenticate::class)->constructor(get(Session::class), get(Cookie::class), get('authentication.method')),
 
     SecurityHandler::class => create(SecurityHandler::class)->constructor(function() {
-        return new RedirectResponse(getenv("URL_BASE")."/login");
+        return Lean\Factory\HttpFactory::createRedirectResponse(getenv("URL_BASE")."/login");
     }, get('authentication.unauthorize'), get(Taxus::class)),
 
-    'authentication.error' => function($c, Picea $picea) {
-        return function($message) use ($picea) {
-            return new HtmlResponse($picea->renderHtml('lean/error/500', [
-                'title' => "",
-                'subtitle' => "",
-                'message' => $message,
-            ]));
-        };
-    },
-
     'authentication.unauthorize' => function($c, Picea $picea) {
         return function($message) use ($picea) {
-            return new HtmlResponse($picea->renderHtml('lean/error/401', [
+            return Lean\Factory\HttpFactory::createHtmlResponse($picea->renderHtml('lean/error/401', [
                 'title' => "",
                 'subtitle' => "",
                 'message' => $message,

skeleton/meta/definitions/definitions.php

@@ -7,15 +7,14 @@ $dir = getenv("META_PATH") . "/definitions";
 return array_merge(
     Lean\Lean::definitions(),
 
-    Lean\Console\Lean::definitions(),
+    Lean\Lean::autoloadDefinitionsFromComposerExtra(),
 
     [
         '%APPKEY%' => [
             'picea' => [
                 'context' => "%ESCAPED_NAMESPACE%\\View",
-
+                'asset' => [],
-                'extensions' => [
+                'extensions' => [],
-                ],
 
             ],
 
@@ -39,11 +38,20 @@ return array_merge(
                 '%ESCAPED_NAMESPACE%\\Controller' => implode(DIRECTORY_SEPARATOR, [ getenv("PROJECT_PATH"), 'src', 'Controller', '' ]),
             ],
         ],
+
+        'app.middlewares' => [],
     ],
 
     require("$dir/auth.php"),
     require("$dir/storage.php"),
     require("$dir/security.php"),
     require("$dir/env/" . getenv('APP_ENV') . ".php"),
-    [ 'config' => function () { return require(getenv("META_PATH")."/config.php"); } ]
+    [
+        'config' => function () {
+            return array_merge_recursive(
+                Lean\Lean::autoloadConfigFromComposerExtra(),
+                require(getenv("META_PATH")."/config.php")
+            );
+        }
+    ]
 );

skeleton/meta/definitions/security.php

@@ -1,13 +1,13 @@
 <?php
 
-use function DI\autowire, DI\create, DI\get;
-
 use Storage\Session;
 
 use Taxus\{ Privilege, Taxus, PermissionGrantInterface, DefaultPermissionGrant };
 
 use Psr\Http\Message\ServerRequestInterface;
 
+use function DI\autowire, DI\create, DI\get;
+
 return [
     Taxus::class => function ($c) {
         return ( new Taxus( $c->get(PermissionGrantInterface::class) ) )->add(

skeleton/src/Lib/ControllerTrait.php

@@ -5,36 +5,33 @@ namespace %NAMESPACE%\Lib;
 use Picea\Picea;
 use Storage\Session;
 use Ulmus\User\Entity\User;
-use Ulmus\User\Lib\Authenticate;
 use Notes\Route\Attribute\Object\Route;
 use Notes\Security\Attribute\Security;
 
 use %NAMESPACE%\{ Entity, Lib, Form };
 
 use Mcnd\Event\EventManager;
+use Ulmus\User\Entity\UserInterface;
 
 #[Security(locked: false)]
 #[Route(method: ['GET', 'POST', ])]
 trait ControllerTrait {
     use \Lean\ControllerTrait;
 
-    public ? \Ulmus\User\Entity\User $user;
+    public ? UserInterface $user;
-
-    protected Authenticate $authenticate;
 
     protected EventManager $eventManager;
 
-    public function __construct(Picea $picea, Session $session, Authenticate $authenticate, \Notes\Breadcrumb\Breadcrumb $breadcrumb, EventManager $eventManager) {
+    public function __construct(Picea $picea, Session $session, UserInterface $user, \Notes\Breadcrumb\Breadcrumb $breadcrumb, EventManager $eventManager) {
-        $this->initializeController($picea, $session, $authenticate, $breadcrumb, $eventManager);
+        $this->initializeController($picea, $session, $user, $breadcrumb, $eventManager);
     }
 
-    public function initializeController(Picea $picea, Session $session, Authenticate $authenticate, \Notes\Breadcrumb\Breadcrumb $breadcrumb, EventManager $eventManager) {
+    public function initializeController(Picea $picea, Session $session, UserInterface $user, \Notes\Breadcrumb\Breadcrumb $breadcrumb, EventManager $eventManager) {
         $this->picea = $picea;
-        $this->authenticate = $authenticate;
         $this->session = $session;
         $this->eventManager = $eventManager;
         $this->breadcrumb = $breadcrumb;
-        $this->user = $authenticate->rememberMe( Entity\User::repository() ) ?: new Entity\User();
+        $this->user = $user;
     }
 
 }

src/Application.php

@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Lean;
 
-
 class Application
 {
     public string $name;
@@ -12,6 +10,8 @@ class Application
 
     public array $piceaExtensions;
 
+    public array $piceaAssets;
+
     public array $views;
 
     public array $routes;
@@ -47,6 +47,10 @@ class Application
                 $this->piceaExtensions = $picea['extensions'];
             }
 
+            if ($picea['asset'] ?? false ) {
+                $this->piceaAssets = $picea['asset'];
+            }
+
             if ($picea['view'] ?? false) {
                 $this->views = $picea['view'];
             }

src/ApplicationStrategy.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Lean;
+
+use League\Route\Strategy;
+
+use League\Route\Http\Exception\NotFoundException;
+use Picea\Asset\Asset;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Picea\Picea;
+use Psr\Http\Server\RequestHandlerInterface;
+use function DI\get;
+
+class ApplicationStrategy extends Strategy\ApplicationStrategy {
+
+    public const ASSET_TRIGGER_UPDATE = [
+        "js", "mjs", "manifest", "webmanifest", "css", "png", "ico",
+        "jpg", "jpeg", "gif", "webp", "woff", "woff2", "eot", "svg",
+        "ttf"
+    ];
+
+    public function __construct(
+        protected Picea $picea,
+        protected ContainerInterface $di,
+    ) {}
+
+    public function getNotFoundDecorator(NotFoundException $exception): MiddlewareInterface
+    {
+        return new class($this->picea, $this->di) implements MiddlewareInterface {
+
+            public function __construct(
+                protected Picea $picea,
+                protected ContainerInterface $di,
+            ) { }
+
+            public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+            {
+                return $this->throw404($request);
+            }
+
+            public function throw404(ServerRequestInterface $request) : ResponseInterface
+            {
+                if ( getenv('DEBUG') && $this->di->has(\Picea\Asset\Asset::class) ) {
+                    $params = $request->getServerParams();
+
+                    $scpName = basename(explode('?', $params['REQUEST_URI'] ?? "", 2)[0]);
+                    list(, $ext) = array_pad(explode('.', $scpName), 2, null);
+
+                    if ($ext && in_array($ext, ApplicationStrategy::ASSET_TRIGGER_UPDATE)) {
+                        $this->di->get(\Picea\Asset\Asset::class)->launchInstall();
+                    }
+                }
+
+                return new \Laminas\Diactoros\Response\HtmlResponse($this->picea->renderHtml("lean/error/404", [], $this), 404);
+            }
+        };
+    }
+}

src/Composer.php

@@ -69,18 +69,41 @@ class Composer
 
             new CacheInvalidator($path, true);
         }
+
+        if ( file_exists($container = static::createPath('var/cache/di/CompiledContainer.php')) ) {
+            unlink($container);
+        }
     }
 
-    protected static function readComposerJson(Event $event) : ? array
+    public static function readComposerLock() : false|array
     {
+        static $content = null;
+
+        $path = static::createPath('composer.lock');
+
+        if (! file_exists($path) ) {
+            throw new \UnexpectedValueException("Composer file 'composer.lock' could not be found within your project's root folder.");
+        }
+
+        return $content ??= file_exists($path) ? json_decode(file_get_contents($path), true) : false;
+    }
+
+    public static function readComposerJson() : false|array
+    {
+        static $content = null;
+
         $path = static::createPath('composer.json');
 
-        return file_exists($path) ? json_decode(file_get_contents($path), true) : null;
+        if (! file_exists($path) ) {
+            throw new \UnexpectedValueException("Composer file 'composer.json' could not be found within your project's root folder.");
+        }
+
+        return $content ??= file_exists($path) ? json_decode(file_get_contents($path), true) : false;
     }
 
     protected static function getNamespaceFromAutoload(Event $event) : ? string
     {
-        if ( null !== $composerJson = static::readComposerJson($event) ) {
+        if ( false !== $composerJson = static::readComposerJson() ) {
             if ( $psr4 = $composerJson['autoload']['psr-4'] ?? false ) {
                 foreach($psr4 as $ns => $directory) {
                     if ($directory === 'src/') {
@@ -103,6 +126,6 @@ class Composer
 
     protected static function createPath(... $path) : string
     {
-        return implode(DIRECTORY_SEPARATOR, array_merge([ $_SERVER['PWD'] ], $path));
+        return implode(DIRECTORY_SEPARATOR, array_merge([ $_SERVER['PWD'] ?? getenv('PROJECT_PATH') ], $path));
     }
 }

src/ControllerTrait.php

@@ -2,33 +2,19 @@
 
 namespace Lean;
 
-use Lean\Response\{FileDownloadResponse, PdfResponse, ImageResponse, DownloadResponse};
+use Lean\Factory\HttpFactory;
-
+use Notes\Route\Attribute\Object\Route;
-use Picea,
+use Notes\Security\Attribute\Security;
-    Picea\Ui\Method\FormContext;
+use Picea, Picea\Ui\Method\FormContext;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Storage\Session;
-use Laminas\Diactoros\Response\{EmptyResponse, HtmlResponse, TextResponse, RedirectResponse, JsonResponse};
-
-use Ulmus\EntityCollection;
-
-use Psr\Http\Message\ResponseInterface;
-
 use TheBugs\Email\MailerInterface;
+use Storage\Session;
 
-use Notes\Cronard\Annotation\Method\Cronard,
+use Psr\Http\Message\{ ServerRequestInterface, ResponseInterface };
-    Notes\Breadcrumb\Annotation\Method\Breadcrumb,
-    Notes\Route\Annotation\Object\Route as RouteParam,
-    Notes\Route\Annotation\Method\Route,
-    Notes\Security\Annotation\Security,
-    Notes\Security\Annotation\Taxus,
-    Notes\Tell\Annotation\Language;
 
 use function file_get_contents;
 
-#[\Notes\Security\Attribute\Security(locked: true)]
+#[Security(locked: true)]
-#[\Notes\Route\Attribute\Object\Route(method: [ "GET", "POST", "DELETE" ])]
+#[Route(method: [ "GET", "POST", "DELETE" ])]
 trait ControllerTrait {
     public ? \Notes\Breadcrumb\Breadcrumb $breadcrumb;
 
@@ -52,7 +38,7 @@ trait ControllerTrait {
     public function renderRawView(string $view, ?array $variables = null) : string
     {
         if ( null === $content = $this->picea->renderHtml($view, $variables ?? [], $this) ) {
-            throw new \RuntimeException("Picea's renderHtml() returned NULL as result ; an error occured within your template `$view`.");
+            throw new \RuntimeException("Picea's renderHtml() returned NULL as result ; an error occurred within your template `$view`.");
         }
 
         return $content;
@@ -78,47 +64,58 @@ trait ControllerTrait {
     }
 
     protected function redirect(string $url, int $code = 302, array $headers = []) {
-        return new RedirectResponse($url, $code, $headers);
+        return HttpFactory::createRedirectResponse($url, $code, $headers);
     }
 
     public static function renderNothing(int $code = 204, array $headers = []) : ResponseInterface
     {
-	    return new EmptyResponse($code, $headers);
+	    return HttpFactory::createEmptyResponse($code, $headers);
     }
 
-    public static function renderText(string $html, int $code = 200, array $headers = []) : ResponseInterface
+    public static function renderText(string $text, int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new TextResponse($html, $code, $headers);
+        return HttpFactory::createTextResponse($text, $code, $headers);
     }
 
     public static function renderHtml(string $html, int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new HtmlResponse($html, $code, $headers);
+        return HttpFactory::createHtmlResponse($html, $code, $headers);
     }
 
     public static function renderJson(mixed $data, int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new JsonResponse($data, $code, $headers);
+        return HttpFactory::createJsonResponse($data, $code, $headers);
     }
 
-    public function renderPdf($rawdata, int $status = 200, array $headers = []) : PdfResponse
+    public function renderPdf($rawdata, int $status = 200, array $headers = []) : ResponseInterface
     {
-        return new PdfResponse($rawdata, $status, $headers);
+        return HttpFactory::createPdfResponse($rawdata, $status, $headers);
     }
 
     public static function renderDownloadable(string $data, string $filename, int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new DownloadResponse($data, $filename, $code, $headers);
+        return HttpFactory::createDownloadableResponse($data, $filename, $code, $headers);
     }
 
     public static function renderImage(string $data, int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new ImageResponse($data, $code, $headers);
+        return HttpFactory::createImageResponse($data, $code, $headers);
     }
 
     public static function renderAsset(string $path, int $code = 200, array $headers = []) : ResponseInterface
     {
-        return new FileDownloadResponse($path, $code, $headers);
+        return HttpFactory::createFileDownloadResponse($path, $code, $headers);
+    }
+
+    public function renderMarkdown(string $filepath, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        if ( ! class_exists(CommonMarkConverter::class)) {
+            throw new \BadFunctionCallException("League\CommonMark seems to be missing, please install dependency before trying to render Markdown content");
+        }
+
+        $markdown = ( new CommonMarkConverter() )->convertToHtml(file_get_contents($filepath));
+
+        return $this->renderView("docs", get_defined_vars());
     }
 
     public function renderCLI(ServerRequestInterface $request, mixed $data) : ResponseInterface

src/Event/RoutingCompileRoutes.php

@@ -6,5 +6,5 @@ use Lean\Routing;
 use Notes\Route\Attribute\Method\Route;
 
 interface RoutingCompileRoutes {
-    public function execute(Routing $routing, Route|\Notes\Route\Annotation\Method\Route $attribute) : void;
+    public function execute(Routing $routing, Route $attribute) : void;
 }

src/Event/RoutingMapRoutes.php

@@ -8,5 +8,5 @@ use Psr\Container\ContainerInterface;
 use Psr\Http\Message\{ ResponseInterface, ServerRequestInterface };
 
 interface RoutingMapRoutes {
-    public function execute(Routing $routing, ContainerInterface $container, ServerRequestInterface & $request, Route|\Notes\Route\Annotation\Method\Route $attribute) : void;
+    public function execute(Routing $routing, ContainerInterface $container, ServerRequestInterface & $request, Route $attribute) : void;
 }

src/Factory/HttpFactory.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Lean\Factory;
+
+use Laminas\Diactoros\Response\{EmptyResponse, HtmlResponse, JsonResponse, RedirectResponse, TextResponse};
+use Lean\Response\{ DownloadResponse, ImageResponse, FileDownloadResponse, PdfResponse };
+use Psr\Http\Message\ResponseInterface;
+
+class HttpFactory
+{
+    public static function createRedirectResponse(string $url, int $code = 302, array $headers = []) : ResponseInterface
+    {
+        return new RedirectResponse($url, $code, $headers);
+    }
+
+    public static function createHtmlResponse(string $html, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new HtmlResponse($html, $code, $headers);
+    }
+
+    public static function createTextResponse(string $text, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new TextResponse($text, $code, $headers);
+    }
+
+    public static function createJsonResponse(mixed $data, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new JsonResponse($data, $code, $headers);
+    }
+
+    public static function createEmptyResponse(int $code = 204, array $headers = []) : ResponseInterface
+    {
+        return new EmptyResponse($code, $headers);
+    }
+
+    public static function createPdfResponse(\Stringable $binary, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new PdfResponse((string) $binary, $code, $headers);
+    }
+
+    public static function createDownloadableResponse(string $data, string $filename, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new DownloadResponse($data, $filename, $code, $headers);
+    }
+
+    public static function createImageResponse(string $data, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new ImageResponse($data, $code, $headers);
+    }
+
+    public static function createFileDownloadResponse(string $path, int $code = 200, array $headers = []) : ResponseInterface
+    {
+        return new FileDownloadResponse($path, $code, $headers);
+    }
+}

src/Kernel.php

@@ -110,8 +110,17 @@ class Kernel {
 
         if (getenv("APP_ENV") === "prod") {
             if (getenv("CACHE_PATH")) {
-              #  $containerBuilder->enableCompilation(getenv("CACHE_PATH") . "/di/");
+                # check if ACPU is there first, $containerBuilder->enableDefinitionCache();
-             #   $containerBuilder->writeProxiesToFile(true);
+
+                $containerBuilder->enableCompilation(getenv("CACHE_PATH") . "/di/");
+                # No proxies yet... $containerBuilder->writeProxiesToFile(true, getenv("CACHE_PATH") . "/di/");
+            }
+        }
+        else {
+            $compiled = getenv("CACHE_PATH") . "/di/CompiledContainer.php";
+
+            if ( file_exists($compiled) ) {
+                unlink($compiled);
             }
         }
 

src/LanguageHandler.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Lean;
+
+use Picea\Extension\LanguageHandlerInterface;
+use Tell;
+
+class LanguageHandler implements LanguageHandlerInterface {
+
+    public function __construct(
+        public Tell\I18n $tell
+    ) {}
+
+    public function languageFromKey(string $key, array $variables = []) #: array|string
+    {
+        return $this->tell->fromKey($key, $variables) ?: "";
+    }
+}

src/Lean.php

@@ -93,6 +93,11 @@ class Lean
         return array_merge(...array_map(fn($app) => $app->events ?? [], $this->applications));
     }
 
+    public function getTaxusPrivileges() : array
+    {
+        return array_merge(...array_map(fn($app) => $app->taxus ?? [], $this->applications));
+    }
+
     public function getEntities() : array
     {
         return array_merge(...array_map(fn($app) => $app->entities ?? [], $this->applications));
@@ -102,11 +107,33 @@ class Lean
     {
         $list = array_merge(...array_map(fn($app) => $app->views ?? [], $this->applications));
 
+        $this->verifyPathList($list);
+
         uasort($list, fn($i1, $i2) => $i1['order'] <=> $i2['order'] );
 
         return $list;
     }
 
+    public function getAssetPaths() : array
+    {
+        $list = array_merge(...array_map(fn($app) => $app->piceaAssets ?? [], $this->applications));
+
+        $this->verifyPathList($list);
+
+        uasort($list, fn($i1, $i2) => $i1['order'] <=> $i2['order'] );
+
+        return $list;
+    }
+
+    protected function verifyPathList(array $list) : void
+    {
+        foreach($list as $item) {
+            if (! isset($item['order']) ) {
+                throw new \RuntimeException(sprintf("An error occured while verifying a path list (%s)", json_encode($item, \JSON_PRETTY_PRINT)));
+            }
+        }
+    }
+
     public function getI18n(string $reader) : ? array
     {
         switch($reader) {
@@ -130,9 +157,12 @@ class Lean
 
     public static function definitions() : array
     {
+        return [];
+
         $path = dirname(__DIR__) . "/meta/definitions/";
 
-        return array_merge(
+        return array_replace(
+            require($path . "authorize.php"),
             class_exists(\Mcnd\CLI\CliMiddleware::class) ? require($path . "cli.php") : [],
             class_exists(\Cronard\CronardMiddleware::class) ? require($path . "cronard.php") : [],
             require($path . "email.php"),
@@ -141,9 +171,58 @@ class Lean
             require($path . "language.php"),
             class_exists(\Negundo\Client\NegundoMiddleware::class) ? require($path . "negundo.php") : [],
             require($path . "routes.php"),
-            # require($path . "security.php"),
             require($path . "software.php"),
+            require($path . "storage.php"),
             class_exists(\Picea\Picea::class) ?  require($path . "template.php") : [],
         );
     }
+
+    public static function autoloadDefinitionsFromComposerExtra() : array
+    {
+        $list = [];
+
+        foreach(Composer::readComposerLock()['packages'] as $package) {
+            foreach($package['extra']['lean']['autoload']['definitions'] ?? [] as $autoload) {
+                $list = array_replace($list, static::loadFromPackage($package, $autoload));
+            }
+        }
+
+        return $list;
+    }
+
+    public static function autoloadConfigFromComposerExtra() : array
+    {
+        $list = [];
+
+        foreach(Composer::readComposerLock()['packages'] as $package) {
+            foreach($package['extra']['lean']['autoload']['config'] ?? [] as $autoload) {
+                $list = array_merge_recursive($list, static::loadFromPackage($package, $autoload));
+            }
+        }
+
+        return $list;
+    }
+
+    protected static function loadFromPackage(array $package, array|string $autoload) : false|array
+    {
+        $list = [];
+
+        if (is_string($autoload)) {
+            $vendor = getenv('VENDOR_DIR') ? getenv('VENDOR_PATH') : dirname(__DIR__, 3);
+            $file = $vendor . DIRECTORY_SEPARATOR . $package['name'] . DIRECTORY_SEPARATOR . $autoload;
+
+            if ( ! file_exists($file) ) {
+                throw new \InvalidArgumentException(sprintf("Given autoload file `%s` from package `%s` was not found or is unreachable", $autoload, $package['name']));
+            }
+
+            return require($file);
+        }
+        else {
+            $func = implode('::', array_merge([ key($autoload) ], $autoload));
+
+            return call_user_func($func);
+        }
+
+        return false;
+    }
 }

src/PiceaDefaultRegistration.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Lean;
+
+use Picea\Compiler;
+use Picea\Language\DefaultRegistrations;
+use Picea\{ Ui\Ui, Asset\Asset };
+
+class PiceaDefaultRegistration extends DefaultRegistrations {
+
+    public function __construct(
+        protected array $extensions,
+        protected array $syntaxes,
+        protected array $controlStructures,
+        public null|Ui $ui,
+        public null|Asset $asset,
+    ) {
+        parent::__construct($this->extensions, $this->syntaxes, $this->controlStructures);
+    }
+
+    public function registerAll(Compiler $compiler) : void
+    {
+        parent::registerAll($compiler);
+
+        $this->ui AND $this->ui->registerFormExtension($compiler);
+        $this->asset AND $this->asset->registerExtension($compiler);
+    }
+}

view/lean/layout/error.phtml

@@ -8,9 +8,6 @@
 
             <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato|Ubuntu%20Mono">
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css">
-            <link rel="stylesheet" href='{% asset "asset/css/bulma.extension.css" %}'>
-            <link rel="stylesheet" href="https://cdn.eckinox.net/fontawesome/latest/css/fontawesome-all.min.css">
-
 
             <style>
                 body {background:#272822}