feat: add first-class database integration, update Bootstrapper/provider order, fix schema resolution and improve container stability

Author: KolesnikovKirill

CHANGELOG.md

@@ -2,6 +2,46 @@
 
 All notable changes to **codemonster-ru/annabel** will be documented in this file.
 
+## [1.11.0] – 2025-12-09
+
+### Added
+
+-   **First-class database integration** with the `codemonster-ru/database` package:
+
+    -   Added `DatabaseServiceProvider` with proper container bindings for:
+        -   `DatabaseManager`
+        -   automatic connection resolution
+        -   runtime grammar selection (MySQL, SQLite, extensible structure)
+    -   Added container binding for the Schema builder (`Schema`), enabling use of:
+        -   `schema()->create()`
+        -   `schema()->table()`
+        -   `schema()->drop()`
+    -   Automatic loading of DB configuration via `config('database')`.
+
+-   **Support for global helpers from codemonster-ru/support**, including:
+    -   `db()` — returns the current database connection
+    -   `schema()` — returns schema builder for the selected connection
+    -   `transaction()` — executes code inside a DB transaction
+
+### Changed
+
+-   `Bootstrapper` updated to load the new `DatabaseServiceProvider`
+    before view and session providers for correct dependency ordering.
+-   Standardized provider boot order for proper initialization of config,
+    database, view, session, and router layers.
+
+### Fixed
+
+-   Eliminated errors caused by instantiating schema grammars directly from Annabel.
+-   Corrected container resolution of database-related classes when running without Annabel (standalone mode).
+-   Improved stability of the application container when resolving database singletons.
+
+### Improvements
+
+-   Cleaner dependency injection for all DB components.
+-   Better separation between Annabel core and database layer (no hard dependency on MySqlGrammar inside the framework).
+-   Improved developer experience for Xen and other Annabel-based modules using database operations.
+
 ## [1.10.0] - 2025-11-16
 
 ### Added

README.md

@@ -37,25 +37,76 @@ return $app;
 router()->get('/', fn() => view('home', ['title' => 'Welcome to Annabel']));
 ```
 
+## 🗄 Database Integration
+
+Annabel ships with first‑class integration for  
+[`codemonster-ru/database`](https://github.com/codemonster-ru/database).
+
+### 1. Create `config/database.php`
+
+```php
+return [
+    'default' => 'mysql',
+
+    'connections' => [
+        'mysql' => [
+            'driver'   => 'mysql',
+            'host'     => '127.0.0.1',
+            'port'     => 3306,
+            'database' => env('DB_NAME'),
+            'username' => env('DB_USER'),
+            'password' => env('DB_PASS'),
+            'charset'  => 'utf8mb4',
+        ],
+
+        'sqlite' => [
+            'driver'   => 'sqlite',
+            'database' => base_path('database/database.sqlite'),
+        ],
+    ],
+];
+```
+
+### 2. Usage
+
+```php
+// Query builder
+$users = db()->table('users')->where('active', 1)->get();
+
+// Schema builder
+schema()->create('posts', function ($table) {
+    $table->id();
+    $table->string('title');
+});
+
+// Transactions
+transaction(function () {
+    db()->table('logs')->insert(['type' => 'created']);
+});
+```
+
 ## 🧩 Helpers
 
-| Function                | Description                          |
-| ----------------------- | ------------------------------------ |
-| `app()`                 | Access the application container     |
-| `base_path()`           | Resolve base project paths           |
-| `config()`              | Get or set configuration values      |
-| `dump()` / `dd()`       | Debugging utilities                  |
-| `env()`                 | Read environment variables           |
-| `request()`             | Get current HTTP request             |
-| `response()`/ `json()`  | Create HTTP response                 |
-| `router()` / `route()`  | Access router instance               |
-| `session()`/ `render()` | Read, write, or access session store |
-| `view()`                | Render or return view instance       |
+| Function                | Description                        |
+| ----------------------- | ---------------------------------- |
+| `app()`                 | Access the application container   |
+| `base_path()`           | Resolve base project paths         |
+| `config()`              | Get or set configuration values    |
+| `env()`                 | Read environment variables         |
+| `dump()` / `dd()`       | Debugging utilities                |
+| `request()`             | Get current HTTP request           |
+| `response()` / `json()` | Create HTTP response               |
+| `router()` / `route()`  | Access router instance             |
+| `view()`                | Render or return view instance     |
+| `session()`             | Access session store               |
+| `db()`                  | Get the active database connection |
+| `schema()`              | Get the schema builder             |
+| `transaction()`         | Execute a DB transaction           |
+
+All helpers are autoloaded automatically.
 
 ## 🧪 Testing
 
-You can run tests with the command:
-
 ```bash
 composer test
 ```

src/Bootstrap/Bootstrapper.php

@@ -50,6 +50,7 @@ protected function registerProviders(): void
     {
         $defaultProviders = [
             \Codemonster\Annabel\Providers\CoreServiceProvider::class,
+            \Codemonster\Annabel\Providers\DatabaseServiceProvider::class,
             \Codemonster\Annabel\Providers\ViewServiceProvider::class,
             \Codemonster\Annabel\Providers\SessionServiceProvider::class,
         ];

src/Providers/DatabaseServiceProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Codemonster\Annabel\Providers;
+
+use Codemonster\Annabel\Contracts\ServiceProviderInterface;
+use Codemonster\Database\DatabaseManager;
+
+class DatabaseServiceProvider implements ServiceProviderInterface
+{
+    public function __construct(protected $app) {}
+
+    public function register(): void
+    {
+        // Register DatabaseManager as singleton
+        $this->app->singleton(DatabaseManager::class, function () {
+            $config = config('database') ?? [
+                'default' => 'mysql',
+                'connections' => [],
+            ];
+
+            return new DatabaseManager($config);
+        });
+    }
+
+    public function boot(): void
+    {
+        // optional: nothing to boot
+    }
+}