diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a0832d..72291482 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,57 @@
+## 1.14.0
+
+- New `DBSQLiteAdapter`: an embedded SQLite DB adapter, backed by the
+  [`sqlite3`][sqlite3_pkg] package.
+
+  ```dart
+  import 'package:bones_api/bones_api_db_sqlite.dart';
+
+  var adapter = DBSQLiteAdapter('/var/lib/myapp/db.sqlite',
+      generateTables: true);
+
+  // Or an in-memory database:
+  var memoryAdapter = DBSQLiteAdapter(':memory:', generateTables: true);
+  ```
+
+  - Registered as `sqlite`, `sqlite3`, `sql.sqlite` and `sql.sqlite3`, so a
+    config block `db: { sqlite: {...} }` resolves it.
+  - `fromConfig` accepts `path`/`file`/`database`/`db` for the database file,
+    and `memory: true` (or the path `:memory:`) for an in-memory database, plus
+    the usual `generateTables`/`checkTables`/`populate`/`log.sql` keys.
+    Irrelevant keys (`host`, `port`, `username`, `password`) are accepted and
+    ignored, so a config can be pointed at SQLite without being rewritten.
+  - **No server and no native library to install**: the `sqlite3` package
+    bundles SQLite (3.53.4) through Dart's build hooks.
+  - Runs the same entity test-suite as the PostgreSQL and MySQL adapters, and
+    needs no `Docker` container to do it. New `APITestConfigSQLite`, exported by
+    `package:bones_api/bones_api_test_sqlite.dart`.
+
+  - Notes on the SQLite dialect:
+    - An auto-assigning ID is declared `INTEGER PRIMARY KEY AUTOINCREMENT`:
+      SQLite has no `SERIAL`/`AUTO_INCREMENT`, only a column declared exactly
+      `INTEGER PRIMARY KEY` aliases the `rowid`, and without `AUTOINCREMENT`
+      SQLite reuses the ID of a deleted row.
+    - `ENUM` is emulated with a `VARCHAR CHECK (col IN (...))` constraint.
+    - Since `sqlite3` is a **synchronous** driver, and SQLite allows a single
+      writer, the adapter uses one native handle shared by every pooled
+      connection: a second handle blocking on a lock would stall the isolate
+      holding it, and offers nothing to gain when there is no I/O to overlap.
+      Nested transactions use `SAVEPOINT`.
+
+- New `SQLDialect.returningAcceptsTableWildcard` (default `true`, so the
+  PostgreSQL/MySQL/memory dialects are unchanged). SQLite rejects the
+  table-qualified wildcard that `DELETE ... RETURNING` emits
+  (*"RETURNING may not use TABLE.\* wildcards"*) and needs a bare
+  `RETURNING *`.
+
+- **Breaking**: the minimum Dart SDK is now **3.10.0** (was 3.7.0), required by
+  `sqlite3` and its build hooks.
+
+- Dependencies:
+  - Added `sqlite3: ^3.5.1`
+
+[sqlite3_pkg]: https://pub.dev/packages/sqlite3
+
 ## 1.13.0
 
 - New `EntityPagination.onEvent`: an optional hook notified of what is being
diff --git a/README.md b/README.md
index bb8cde41..293707e2 100644
--- a/README.md
+++ b/README.md
@@ -539,15 +539,34 @@ postgres:
 
 To use a SQL database with your `EntityRepository` you need a `SQLAdapter`:
 
-- `PostgreSQLAdapter`: a [PostgreSQL][postgres] adapter.
-- `MySQLAdapter`: A [MySQL][mysql] adapter.
-- `MemorySQLAdapter`: a portable `SQLAdapter` that stores entities in memory.
+- `DBPostgreSQLAdapter`: a [PostgreSQL][postgres] adapter.
+  Import: `package:bones_api/bones_api_db_postgre.dart`
+- `DBMySQLAdapter`: a [MySQL][mysql] adapter.
+  Import: `package:bones_api/bones_api_db_mysql.dart`
+- `DBSQLiteAdapter`: an embedded [SQLite][sqlite] adapter, for a database file
+  or an in-memory database. Needs no server and no native library: the
+  [`sqlite3`][sqlite3_pkg] package bundles SQLite itself.
+  Import: `package:bones_api/bones_api_db_sqlite.dart`
+- `DBSQLMemoryAdapter`: a portable `SQLAdapter` that stores entities in memory.
 
 The `SQLAdapter` is responsible to connect to the database, manage the connection
 pool and also to adjust the generated SQLs to the correct dialect.
 
+Example of a SQLite configuration:
+
+```yaml
+db:
+  sqlite:
+    path: /var/lib/myapp/db.sqlite
+    generateTables: true
+```
+
+Use `memory: true` (or `path: ':memory:'`) for an in-memory database.
+
 [postgres]: https://www.postgresql.org/
 [mysql]: https://www.mysql.com/
+[sqlite]: https://www.sqlite.org/
+[sqlite3_pkg]: https://pub.dev/packages/sqlite3
 
 ## Bones_UI
 
diff --git a/bin/bones_api.dart b/bin/bones_api.dart
index fdfc6df4..b4b693e6 100644
--- a/bin/bones_api.dart
+++ b/bin/bones_api.dart
@@ -26,13 +26,12 @@ void main(List<String> args) async {
   await commandInfo.configure();
   await commandCreate.configure();
 
-  var commandRunner =
-      CommandRunner<bool>('bones_api', '$cliTitle - CLI Tool')
-        ..addCommand(MyCommandServe())
-        ..addCommand(MyCommandConsole())
-        ..addCommand(MyCommandInspect())
-        ..addCommand(commandInfo)
-        ..addCommand(commandCreate);
+  var commandRunner = CommandRunner<bool>('bones_api', '$cliTitle - CLI Tool')
+    ..addCommand(MyCommandServe())
+    ..addCommand(MyCommandConsole())
+    ..addCommand(MyCommandInspect())
+    ..addCommand(commandInfo)
+    ..addCommand(commandCreate);
 
   commandRunner.argParser.addFlag(
     'version',
@@ -248,19 +247,17 @@ class MyCommandServe extends CommandSourceFileBase {
     var val = argResults!['domain'];
     if (val == null) return <String, String>{};
 
-    var values =
-        (val is List ? val : [val])
-            .map((e) => e != null ? '$e'.trim() : '')
-            .where((e) => e.isNotEmpty)
-            .toList();
+    var values = (val is List ? val : [val])
+        .map((e) => e != null ? '$e'.trim() : '')
+        .where((e) => e.isNotEmpty)
+        .toList();
 
-    var entries =
-        values.map((e) {
-          var parts = e.split('=');
-          var domain = parts[0].trim();
-          var path = parts.length > 1 ? parts[1].trim() : '';
-          return MapEntry(domain, path);
-        }).toList();
+    var entries = values.map((e) {
+      var parts = e.split('=');
+      var domain = parts[0].trim();
+      var path = parts.length > 1 ? parts[1].trim() : '';
+      return MapEntry(domain, path);
+    }).toList();
 
     return Map<String, String>.fromEntries(entries);
   }
@@ -635,7 +632,8 @@ class MyCommandServe extends CommandSourceFileBase {
     String projectLibraryName,
     String apiRootClass,
   ) {
-    var script = '''
+    var script =
+        '''
 import 'package:bones_api/bones_api_server.dart';
 import 'package:bones_api/bones_api_dart_spawner.dart';
 
@@ -852,7 +850,8 @@ class MyCommandConsole extends CommandSourceFileBase {
     String projectLibraryName,
     String apiRootClass,
   ) {
-    var script = '''
+    var script =
+        '''
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
diff --git a/dart_test.yaml b/dart_test.yaml
index 4ffe168a..002f3e6e 100644
--- a/dart_test.yaml
+++ b/dart_test.yaml
@@ -17,6 +17,9 @@ tags:
   # Tests that uses `MySQL`.
   mysql:
     timeout: 180s
+  # Tests that uses `SQLite` (embedded: no container needed).
+  sqlite:
+    timeout: 180s
   # Slow tests.
   slow:
     timeout: 180s
diff --git a/example/bones_api_example.dart b/example/bones_api_example.dart
index 57ef77fd..1af9702d 100644
--- a/example/bones_api_example.dart
+++ b/example/bones_api_example.dart
@@ -43,7 +43,8 @@ class MyBTCModule extends APIModule {
     // The requested path:
     var path = request.path;
 
-    var body = '''
+    var body =
+        '''
     <h1>404</h1><br>
     <b>PATH:<b> $path
     <p>
diff --git a/lib/bones_api_db_sqlite.dart b/lib/bones_api_db_sqlite.dart
new file mode 100644
index 00000000..d0471a39
--- /dev/null
+++ b/lib/bones_api_db_sqlite.dart
@@ -0,0 +1,4 @@
+/// Bones_API DB Adapter for SQLite.
+library;
+
+export 'src/bones_api_entity_db_sqlite.dart';
diff --git a/lib/bones_api_test_sqlite.dart b/lib/bones_api_test_sqlite.dart
new file mode 100644
index 00000000..c7e85eb3
--- /dev/null
+++ b/lib/bones_api_test_sqlite.dart
@@ -0,0 +1,5 @@
+/// Bones_API Test SQLite Library.
+library;
+
+export 'bones_api_test.dart';
+export 'src/bones_api_test_utils_sqlite.dart';
diff --git a/lib/src/bones_api_authentication.dart b/lib/src/bones_api_authentication.dart
index b315e76a..b95cea85 100644
--- a/lib/src/bones_api_authentication.dart
+++ b/lib/src/bones_api_authentication.dart
@@ -33,10 +33,9 @@ class APICredential {
     this.refreshToken,
     String? passwordHash,
     APIPasswordHashAlgorithm? hashAlgorithm,
-  }) : password =
-           passwordHash != null
-               ? APIPassword(passwordHash, hashAlgorithm: hashAlgorithm)
-               : null;
+  }) : password = passwordHash != null
+           ? APIPassword(passwordHash, hashAlgorithm: hashAlgorithm)
+           : null;
 
   APICredential._(
     this.username,
@@ -201,8 +200,8 @@ abstract class APIPasswordHashAlgorithm {
   /// Ensures that [passwordOrHash] is hashed with this algorithm.
   String ensureHashedPassword(String passwordOrHash) =>
       isHashedPassword(passwordOrHash)
-          ? passwordOrHash
-          : hashPassword(passwordOrHash);
+      ? passwordOrHash
+      : hashPassword(passwordOrHash);
 
   @override
   String toString() {
@@ -480,10 +479,9 @@ class APIToken implements Comparable<APIToken> {
   }) : token = token ?? generateToken(512, variableLength: 32, prefix: 'TK'),
        issueTime = issueTime ?? DateTime.now(),
        duration = duration ?? Duration(hours: 3),
-       refreshToken =
-           refreshToken == null && withRefreshToken
-               ? generateToken(640, variableLength: 64, prefix: 'RTK')
-               : refreshToken;
+       refreshToken = refreshToken == null && withRefreshToken
+           ? generateToken(640, variableLength: 64, prefix: 'RTK')
+           : refreshToken;
 
   DateTime get accessTime => _accessTime;
 
diff --git a/lib/src/bones_api_base.dart b/lib/src/bones_api_base.dart
index 6771234f..65d8ca7e 100644
--- a/lib/src/bones_api_base.dart
+++ b/lib/src/bones_api_base.dart
@@ -48,7 +48,7 @@ typedef APILogger =
 /// Bones API Library class.
 class BonesAPI {
   // ignore: constant_identifier_names
-  static const String VERSION = '1.13.0';
+  static const String VERSION = '1.14.0';
 
   static bool _boot = false;
 
@@ -649,12 +649,11 @@ abstract class APIRoot with Initializable, Closable {
         if (response is Future<APIResponse<T>>) {
           return response.then(
             (response) => _callZonedReturn(callZone, request, response),
-            onError:
-                (e, s) => _callZonedReturn(
-                  callZone,
-                  request,
-                  _resolveErrorAPIResponse(e, s),
-                ),
+            onError: (e, s) => _callZonedReturn(
+              callZone,
+              request,
+              _resolveErrorAPIResponse(e, s),
+            ),
           );
         } else {
           return _callZonedReturn(callZone, request, response);
@@ -692,10 +691,9 @@ abstract class APIRoot with Initializable, Closable {
       var original = identical(request.credential, request.originalCredential);
 
       if (original) {
-        var credential =
-            request.credential = request.credential?.copy(
-              withUsernameEntity: false,
-            );
+        var credential = request.credential = request.credential?.copy(
+          withUsernameEntity: false,
+        );
 
         request.originalCredential = credential;
       } else {
@@ -1018,17 +1016,15 @@ abstract class APIRouteHandler<T> {
       _entityResolutionRules ??= _entityResolutionRulesIml();
 
   EntityResolutionRules _entityResolutionRulesIml() {
-    var resolutionRules1 =
-        rules
-            .whereType<APIEntityResolutionRules>()
-            .map((e) => e.resolutionRules)
-            .toList();
-
-    var resolutionRules2 =
-        rules
-            .whereType<APIEntityRules>()
-            .expand((e) => e.entityResolutionRules)
-            .toList();
+    var resolutionRules1 = rules
+        .whereType<APIEntityResolutionRules>()
+        .map((e) => e.resolutionRules)
+        .toList();
+
+    var resolutionRules2 = rules
+        .whereType<APIEntityRules>()
+        .expand((e) => e.entityResolutionRules)
+        .toList();
 
     if (resolutionRules1.isEmpty && resolutionRules2.isEmpty) {
       return EntityResolutionRules.innocuous;
@@ -1050,17 +1046,15 @@ abstract class APIRouteHandler<T> {
       _entityAccessRules ??= _entityAccessRulesImpl();
 
   EntityAccessRules _entityAccessRulesImpl() {
-    var accessRules1 =
-        rules
-            .whereType<APIEntityAccessRules>()
-            .map((e) => e.accessRules)
-            .toList();
-
-    var accessRules2 =
-        rules
-            .whereType<APIEntityRules>()
-            .expand((e) => e.entityAccessRules)
-            .toList();
+    var accessRules1 = rules
+        .whereType<APIEntityAccessRules>()
+        .map((e) => e.accessRules)
+        .toList();
+
+    var accessRules2 = rules
+        .whereType<APIEntityRules>()
+        .expand((e) => e.entityAccessRules)
+        .toList();
 
     if (accessRules1.isEmpty && accessRules2.isEmpty) {
       return EntityAccessRules.innocuous;
@@ -1193,10 +1187,9 @@ class APIRouteInfo {
 
   /// Returns the [Uri] of the route.
   Uri get uri {
-    var baseUri =
-        apiRequest != null
-            ? Uri.tryParse(apiRequest!.origin) ?? Uri.base
-            : Uri.base;
+    var baseUri = apiRequest != null
+        ? Uri.tryParse(apiRequest!.origin) ?? Uri.base
+        : Uri.base;
     var module = routeHandler.module;
     var path = '${module.name}/$name';
 
@@ -1440,13 +1433,12 @@ abstract class APIMetricSet {
     Duration? duration,
     String? description,
     int? n,
-  }) =>
-      metrics[name] = APIMetric(
-        name,
-        duration: duration,
-        description: description,
-        n: n,
-      );
+  }) => metrics[name] = APIMetric(
+    name,
+    duration: duration,
+    description: description,
+    n: n,
+  );
 
   /// Returns a metric.
   APIMetric? getMetric(String name) => metrics[name];
@@ -1650,10 +1642,9 @@ class APIRequest extends APIMetricSet with APIPayload {
        requestedUri =
            requestedUri ??
            Uri(
-             host:
-                 requesterSource == APIRequesterSource.local
-                     ? 'localhost'
-                     : null,
+             host: requesterSource == APIRequesterSource.local
+                 ? 'localhost'
+                 : null,
              path: path,
              queryParameters: parameters?.map(
                (key, value) => MapEntry(
@@ -1737,11 +1728,10 @@ class APIRequest extends APIMetricSet with APIPayload {
     }
 
     var methodVal = arguments.parameters.remove('method');
-    var method =
-        methodVal != null
-            ? parseAPIRequestMethod(methodVal.toString().toLowerCase()) ??
-                APIRequestMethod.GET
-            : APIRequestMethod.GET;
+    var method = methodVal != null
+        ? parseAPIRequestMethod(methodVal.toString().toLowerCase()) ??
+              APIRequestMethod.GET
+        : APIRequestMethod.GET;
 
     var payload = arguments.parameters.remove('payload');
 
@@ -2295,10 +2285,9 @@ class APIRequest extends APIMetricSet with APIPayload {
   @override
   String toString({bool withHeaders = true, bool withPayload = true}) {
     var headersStr = withHeaders ? ', headers: $headers' : '';
-    var payloadStr =
-        withPayload && hasPayload
-            ? ', payloadLength: $payloadLength, payloadMimeType: $payloadMimeType'
-            : '';
+    var payloadStr = withPayload && hasPayload
+        ? ', payloadLength: $payloadLength, payloadMimeType: $payloadMimeType'
+        : '';
 
     return 'APIRequest#$id{ method: ${method.name}, '
         'path: $path, '
@@ -2874,10 +2863,9 @@ class APIResponse<T> extends APIMetricSet with APIPayload {
   }) {
     return APIResponse(
         status ?? this.status,
-        payload:
-            nullPayload
-                ? null
-                : (payload ?? (payloadDynamic == null ? this.payload : null)),
+        payload: nullPayload
+            ? null
+            : (payload ?? (payloadDynamic == null ? this.payload : null)),
         payloadDynamic: nullPayload ? null : payloadDynamic,
         payloadMimeType: mimeType ?? payloadMimeType,
         payloadFileExtension: payloadFileExtension,
@@ -3333,8 +3321,9 @@ class APIResponse<T> extends APIMetricSet with APIPayload {
     headers["Access-Control-Allow-Methods"] =
         allowMethods?.join(',') ?? 'GET,HEAD,PUT,POST,PATCH,DELETE,OPTIONS';
 
-    headers["Access-Control-Allow-Credentials"] =
-        allowCredentials ? 'true' : 'false';
+    headers["Access-Control-Allow-Credentials"] = allowCredentials
+        ? 'true'
+        : 'false';
 
     if (localhost) {
       headers["Access-Control-Allow-Headers"] =
diff --git a/lib/src/bones_api_condition.dart b/lib/src/bones_api_condition.dart
index 4bd57d71..02cb8fa1 100644
--- a/lib/src/bones_api_condition.dart
+++ b/lib/src/bones_api_condition.dart
@@ -44,10 +44,9 @@ abstract class ConditionElement {
       List<ConditionParameter>.unmodifiable([]);
 
   void _setParameters(Iterable<ConditionParameter> parameters) {
-    _parameters =
-        parameters.isEmpty
-            ? _emptyParameters
-            : List<ConditionParameter>.unmodifiable(parameters);
+    _parameters = parameters.isEmpty
+        ? _emptyParameters
+        : List<ConditionParameter>.unmodifiable(parameters);
   }
 }
 
@@ -114,17 +113,15 @@ class ConditionParameter extends ConditionElement {
       }
 
       if (parameters is Map) {
-        namedParameters ??=
-            parameters is Map<String, Object?>
-                ? parameters
-                : parameters.map<String, Object?>(
-                  (key, value) => MapEntry<String, Object?>('$key', value),
-                );
+        namedParameters ??= parameters is Map<String, Object?>
+            ? parameters
+            : parameters.map<String, Object?>(
+                (key, value) => MapEntry<String, Object?>('$key', value),
+              );
       } else if (parameters is Iterable) {
-        positionalParameters ??=
-            parameters is List
-                ? parameters
-                : parameters.toList(growable: false);
+        positionalParameters ??= parameters is List
+            ? parameters
+            : parameters.toList(growable: false);
       }
     }
 
@@ -192,52 +189,48 @@ class ConditionParameter extends ConditionElement {
       namedParameters: namedParameters,
     );
 
-    var otherValue =
-        value is ConditionParameter
-            ? value.getValue(
-              parameters: parameters,
-              positionalParameters: positionalParameters,
-              namedParameters: namedParameters,
-            )
-            : value;
+    var otherValue = value is ConditionParameter
+        ? value.getValue(
+            parameters: parameters,
+            positionalParameters: positionalParameters,
+            namedParameters: namedParameters,
+          )
+        : value;
 
     if (myValue is Iterable) {
       if (otherValue is Iterable) {
         var equals = isEqualsIterableDeep(
           myValue,
           otherValue,
-          valueEquality:
-              (a, b) => EntityHandler.equalsValuesBasic(
-                a,
-                b,
-                entityHandler: entityHandler,
-              ),
+          valueEquality: (a, b) => EntityHandler.equalsValuesBasic(
+            a,
+            b,
+            entityHandler: entityHandler,
+          ),
         );
         return equals;
       } else {
-        var contains =
-            myValue
-                .where(
-                  (v) => EntityHandler.equalsValuesBasic(
-                    v,
-                    otherValue,
-                    entityHandler: entityHandler,
-                  ),
-                )
-                .isNotEmpty;
+        var contains = myValue
+            .where(
+              (v) => EntityHandler.equalsValuesBasic(
+                v,
+                otherValue,
+                entityHandler: entityHandler,
+              ),
+            )
+            .isNotEmpty;
         return contains;
       }
     } else if (otherValue is Iterable) {
-      var contains =
-          otherValue
-              .where(
-                (v) => EntityHandler.equalsValuesBasic(
-                  v,
-                  myValue,
-                  entityHandler: entityHandler,
-                ),
-              )
-              .isNotEmpty;
+      var contains = otherValue
+          .where(
+            (v) => EntityHandler.equalsValuesBasic(
+              v,
+              myValue,
+              entityHandler: entityHandler,
+            ),
+          )
+          .isNotEmpty;
       return contains;
     }
 
@@ -261,14 +254,13 @@ class ConditionParameter extends ConditionElement {
       namedParameters: namedParameters,
     );
 
-    var otherValue =
-        value is ConditionParameter
-            ? value.getValue(
-              parameters: parameters,
-              positionalParameters: positionalParameters,
-              namedParameters: namedParameters,
-            )
-            : value;
+    var otherValue = value is ConditionParameter
+        ? value.getValue(
+            parameters: parameters,
+            positionalParameters: positionalParameters,
+            namedParameters: namedParameters,
+          )
+        : value;
 
     return EntityHandler.graterThanValue(
       myValue,
@@ -290,14 +282,13 @@ class ConditionParameter extends ConditionElement {
       namedParameters: namedParameters,
     );
 
-    var otherValue =
-        value is ConditionParameter
-            ? value.getValue(
-              parameters: parameters,
-              positionalParameters: positionalParameters,
-              namedParameters: namedParameters,
-            )
-            : value;
+    var otherValue = value is ConditionParameter
+        ? value.getValue(
+            parameters: parameters,
+            positionalParameters: positionalParameters,
+            namedParameters: namedParameters,
+          )
+        : value;
 
     return EntityHandler.graterThanOrEqualValue(
       myValue,
@@ -319,14 +310,13 @@ class ConditionParameter extends ConditionElement {
       namedParameters: namedParameters,
     );
 
-    var otherValue =
-        value is ConditionParameter
-            ? value.getValue(
-              parameters: parameters,
-              positionalParameters: positionalParameters,
-              namedParameters: namedParameters,
-            )
-            : value;
+    var otherValue = value is ConditionParameter
+        ? value.getValue(
+            parameters: parameters,
+            positionalParameters: positionalParameters,
+            namedParameters: namedParameters,
+          )
+        : value;
 
     return EntityHandler.lessThanValue(
       myValue,
@@ -348,14 +338,13 @@ class ConditionParameter extends ConditionElement {
       namedParameters: namedParameters,
     );
 
-    var otherValue =
-        value is ConditionParameter
-            ? value.getValue(
-              parameters: parameters,
-              positionalParameters: positionalParameters,
-              namedParameters: namedParameters,
-            )
-            : value;
+    var otherValue = value is ConditionParameter
+        ? value.getValue(
+            parameters: parameters,
+            positionalParameters: positionalParameters,
+            namedParameters: namedParameters,
+          )
+        : value;
 
     return EntityHandler.lessThanOrEqualValue(
       myValue,
@@ -380,14 +369,13 @@ class ConditionParameter extends ConditionElement {
     if (myValue is List) {
       for (var v1 in myValue) {
         for (var v2 in values) {
-          var otherValue =
-              v2 is ConditionParameter
-                  ? v2.getValue(
-                    parameters: parameters,
-                    positionalParameters: positionalParameters,
-                    namedParameters: namedParameters,
-                  )
-                  : v2;
+          var otherValue = v2 is ConditionParameter
+              ? v2.getValue(
+                  parameters: parameters,
+                  positionalParameters: positionalParameters,
+                  namedParameters: namedParameters,
+                )
+              : v2;
 
           var match = EntityHandler.equalsValuesBasic(
             v1,
@@ -401,14 +389,13 @@ class ConditionParameter extends ConditionElement {
       return false;
     } else {
       for (var v2 in values) {
-        var otherValue =
-            v2 is ConditionParameter
-                ? v2.getValue(
-                  parameters: parameters,
-                  positionalParameters: positionalParameters,
-                  namedParameters: namedParameters,
-                )
-                : v2;
+        var otherValue = v2 is ConditionParameter
+            ? v2.getValue(
+                parameters: parameters,
+                positionalParameters: positionalParameters,
+                namedParameters: namedParameters,
+              )
+            : v2;
 
         var match = EntityHandler.equalsValuesBasic(
           myValue,
@@ -792,8 +779,9 @@ abstract class GroupCondition<O> extends Condition<O> {
   final List<Condition> conditions;
 
   GroupCondition(Iterable<Condition> conditions)
-    : conditions =
-          conditions is List<Condition> ? conditions : conditions.toList(),
+    : conditions = conditions is List<Condition>
+          ? conditions
+          : conditions.toList(),
       super._() {
     for (var c in conditions) {
       c._parent = this;
@@ -1139,8 +1127,9 @@ class ConditionIdIN<O> extends Condition<O> {
 
     var idsValues = this.idsValues;
 
-    var params =
-        idsValues.map((e) => e is ConditionParameter ? e : null).nonNulls;
+    var params = idsValues
+        .map((e) => e is ConditionParameter ? e : null)
+        .nonNulls;
     _setParameters(params);
 
     _markResolved();
@@ -1193,11 +1182,11 @@ class ConditionIdIN<O> extends Condition<O> {
     return idsValues.any((p) {
       return p is ConditionParameter
           ? p.matches(
-            id,
-            parameters: parameters,
-            positionalParameters: positionalParameters,
-            namedParameters: namedParameters,
-          )
+              id,
+              parameters: parameters,
+              positionalParameters: positionalParameters,
+              namedParameters: namedParameters,
+            )
           : id == p;
     });
   }
@@ -1219,31 +1208,30 @@ abstract class ConditionKey {
       throw ArgumentError('Empty key');
     }
 
-    var list =
-        _keyRegExp.allMatches(keys).map((m) {
-          var s1 = m.group(1);
-          if (s1 != null) {
-            return ConditionKeyField(s1);
-          }
+    var list = _keyRegExp.allMatches(keys).map((m) {
+      var s1 = m.group(1);
+      if (s1 != null) {
+        return ConditionKeyField(s1);
+      }
 
-          var s2 = m.group(2);
-          if (s2 != null) {
-            return ConditionKeyField(s2);
-          }
+      var s2 = m.group(2);
+      if (s2 != null) {
+        return ConditionKeyField(s2);
+      }
 
-          var field = m.group(3);
-          if (field != null) {
-            return ConditionKeyField(field);
-          }
+      var field = m.group(3);
+      if (field != null) {
+        return ConditionKeyField(field);
+      }
 
-          var index = m.group(4);
-          if (index != null) {
-            var idx = int.parse(index);
-            return ConditionKeyIndex(idx);
-          }
+      var index = m.group(4);
+      if (index != null) {
+        var idx = int.parse(index);
+        return ConditionKeyIndex(idx);
+      }
 
-          throw StateError('Invalid match: $m');
-        }).toList();
+      throw StateError('Invalid match: $m');
+    }).toList();
 
     return list;
   }
@@ -1391,20 +1379,19 @@ abstract class KeyCondition<O, V> extends Condition<O> {
         if (value is Map) {
           keyValue = value[keyName];
         } else if (value is Iterable) {
-          keyValue =
-              value.map((e) {
-                if (e is Map) {
-                  return e[keyName];
-                } else {
-                  var handler = entityHandler?.getEntityHandler(obj: e);
-                  if (handler != null) {
-                    var v = handler.getField(e, keyName);
-                    return v;
-                  } else {
-                    return e;
-                  }
-                }
-              }).toList();
+          keyValue = value.map((e) {
+            if (e is Map) {
+              return e[keyName];
+            } else {
+              var handler = entityHandler?.getEntityHandler(obj: e);
+              if (handler != null) {
+                var v = handler.getField(e, keyName);
+                return v;
+              } else {
+                return e;
+              }
+            }
+          }).toList();
         } else {
           throw StateError(
             "Can't access key[$keyName] for type: ${(value as Object?).runtimeTypeNameUnsafe}",
diff --git a/lib/src/bones_api_condition_encoder.dart b/lib/src/bones_api_condition_encoder.dart
index 25f42c03..81f9984d 100644
--- a/lib/src/bones_api_condition_encoder.dart
+++ b/lib/src/bones_api_condition_encoder.dart
@@ -175,14 +175,14 @@ class TableRelationshipReference {
     String? targetRelationshipFieldIndex,
   }) : sourceRelationshipFieldIndex =
            sourceRelationshipFieldIndex != null &&
-                   sourceRelationshipFieldIndex.isNotEmpty
-               ? sourceRelationshipFieldIndex
-               : null,
+               sourceRelationshipFieldIndex.isNotEmpty
+           ? sourceRelationshipFieldIndex
+           : null,
        targetRelationshipFieldIndex =
            targetRelationshipFieldIndex != null &&
-                   targetRelationshipFieldIndex.isNotEmpty
-               ? targetRelationshipFieldIndex
-               : null;
+               targetRelationshipFieldIndex.isNotEmpty
+           ? targetRelationshipFieldIndex
+           : null;
 
   /// Returns a copy as [TableRelationshipReference],
   /// with entity types [sourceFieldEntityType] and [targetFieldEntityType].
@@ -364,12 +364,11 @@ class TableScheme with FieldsFromMap {
     if (fields != null) {
       var fieldsSimple = fields.map(fieldToSimpleKey).toList();
 
-      fieldsNames =
-          fieldsNames
-              .mapIndexed((i, e) => MapEntry(e, _fieldsNamesSimple[i]))
-              .where((e) => fieldsSimple.contains(e.value))
-              .map((e) => e.key)
-              .toList();
+      fieldsNames = fieldsNames
+          .mapIndexed((i, e) => MapEntry(e, _fieldsNamesSimple[i]))
+          .where((e) => fieldsSimple.contains(e.value))
+          .map((e) => e.key)
+          .toList();
     }
 
     return getFieldsValuesFromMap(
@@ -458,14 +457,13 @@ class TableScheme with FieldsFromMap {
           sourceTable,
         );
 
-        rels =
-            l
-                .where(
-                  (rel) =>
-                      StringUtils.toLowerCaseSimpleCached(rel.sourceTable) ==
-                      sourceTableSimple,
-                )
-                .toList();
+        rels = l
+            .where(
+              (rel) =>
+                  StringUtils.toLowerCaseSimpleCached(rel.sourceTable) ==
+                  sourceTableSimple,
+            )
+            .toList();
 
         if (rels.length == 1) return rels.first;
       }
@@ -476,14 +474,13 @@ class TableScheme with FieldsFromMap {
       var sourceFieldSimpleUnderscored =
           StringUtils.toLowerCaseSimpleUnderscored(sourceField);
 
-      var rels1 =
-          rels
-              .where(
-                (rel) => StringUtils.toLowerCaseSimpleUnderscored(
-                  rel.relationshipTable,
-                ).contains(sourceFieldSimpleUnderscored),
-              )
-              .toList();
+      var rels1 = rels
+          .where(
+            (rel) => StringUtils.toLowerCaseSimpleUnderscored(
+              rel.relationshipTable,
+            ).contains(sourceFieldSimpleUnderscored),
+          )
+          .toList();
 
       if (rels1.length == 1) return rels1.first;
 
@@ -492,25 +489,21 @@ class TableScheme with FieldsFromMap {
       );
 
       if (rels1.isEmpty) {
-        rels1 =
-            rels
-                .where(
-                  (rel) => StringUtils.toLowerCaseSimpleCached(
-                    rel.relationshipTable,
-                  ).contains(sourceFieldSimple),
-                )
-                .toList();
+        rels1 = rels
+            .where(
+              (rel) => StringUtils.toLowerCaseSimpleCached(
+                rel.relationshipTable,
+              ).contains(sourceFieldSimple),
+            )
+            .toList();
       }
 
       var relsNames = StringUtils.trimEqualitiesMap(
         rels1.map((e) => e.relationshipTable).toList(),
         delimiter: '_',
         normalizer: (s) => StringUtils.toLowerCaseSimpleUnderscored(s),
-        validator:
-            (s) =>
-                !StringUtils.toLowerCaseSimpleCached(
-                  s,
-                ).contains(sourceFieldSimple),
+        validator: (s) =>
+            !StringUtils.toLowerCaseSimpleCached(s).contains(sourceFieldSimple),
       );
 
       var relsNamesSimple = relsNames.map(
@@ -518,19 +511,17 @@ class TableScheme with FieldsFromMap {
             MapEntry(key, StringUtils.toLowerCaseSimpleCached(value)),
       );
 
-      var rels2 =
-          rels1.where((rel) {
-            var f = relsNamesSimple[rel.relationshipTable]!;
-            return f.contains(sourceFieldSimple);
-          }).toList();
+      var rels2 = rels1.where((rel) {
+        var f = relsNamesSimple[rel.relationshipTable]!;
+        return f.contains(sourceFieldSimple);
+      }).toList();
 
       if (rels2.length == 1) return rels2.first;
 
-      var rels3 =
-          rels1.where((rel) {
-            var f = relsNamesSimple[rel.relationshipTable]!;
-            return f == sourceFieldSimple;
-          }).toList();
+      var rels3 = rels1.where((rel) {
+        var f = relsNamesSimple[rel.relationshipTable]!;
+        return f == sourceFieldSimple;
+      }).toList();
 
       if (rels3.length == 1) return rels3.first;
 
@@ -615,8 +606,9 @@ class TableScheme with FieldsFromMap {
 
   @override
   String toString() {
-    var constraintNotPrimary =
-        constraints.where((e) => e is! TablePrimaryKeyConstraint).toList();
+    var constraintNotPrimary = constraints
+        .where((e) => e is! TablePrimaryKeyConstraint)
+        .toList();
 
     return 'TableScheme{name: $name, '
         'idFieldName: $idFieldName, '
@@ -1139,10 +1131,9 @@ class EncodingContext {
     }
 
     for (var i = 0; i < 1000; ++i) {
-      var k =
-          i == 0
-              ? '$parameterPrefix$suggestedKey'
-              : '$parameterPrefix$suggestedKey$i';
+      var k = i == 0
+          ? '$parameterPrefix$suggestedKey'
+          : '$parameterPrefix$suggestedKey$i';
 
       if (!namedParameters.containsKey(k)) {
         encodingParameters[k] = value;
@@ -1390,26 +1381,22 @@ abstract class ConditionEncoder {
         valueType,
         true,
       ).resolveMapped((values) {
-        var list =
-            values is List
-                ? values
-                : (values is Iterable
-                    ? values.toList(growable: false)
-                    : [values]);
-
-        var placeHolders =
-            list.mapIndexed((i, v) {
-              var k = parameterPlaceholderIndexKey(valueKey, i);
-              context.parametersPlaceholders[k] ??= v;
-              var placeholder = parameterPlaceholder(k);
-              return EncodingPlaceholderIndex(
-                valueKey,
-                valueType,
-                placeholder,
-                i,
-                encodeEncodingPlaceholderIndex,
-              );
-            }).toList();
+        var list = values is List
+            ? values
+            : (values is Iterable ? values.toList(growable: false) : [values]);
+
+        var placeHolders = list.mapIndexed((i, v) {
+          var k = parameterPlaceholderIndexKey(valueKey, i);
+          context.parametersPlaceholders[k] ??= v;
+          var placeholder = parameterPlaceholder(k);
+          return EncodingPlaceholderIndex(
+            valueKey,
+            valueType,
+            placeholder,
+            i,
+            encodeEncodingPlaceholderIndex,
+          );
+        }).toList();
 
         return EncodingValueList(
           valueKey,
@@ -1480,11 +1467,10 @@ abstract class ConditionEncoder {
       if (value == null) {
         return [];
       } else if (value is Iterable) {
-        var list =
-            value
-                .map((v) => _resolveValueToTypeCompatibleImpl(v, valueType))
-                .toList(growable: false)
-                .resolveAll();
+        var list = value
+            .map((v) => _resolveValueToTypeCompatibleImpl(v, valueType))
+            .toList(growable: false)
+            .resolveAll();
         return list;
       } else {
         var list = _resolveValueToTypeCompatibleImpl(
diff --git a/lib/src/bones_api_condition_parser.dart b/lib/src/bones_api_condition_parser.dart
index b1e6325e..fcbb76a7 100644
--- a/lib/src/bones_api_condition_parser.dart
+++ b/lib/src/bones_api_condition_parser.dart
@@ -63,10 +63,9 @@ abstract class JsonGrammarLexer extends GrammarDefinition {
 
   Parser<List> pair2() => keyToken2() & char(':').trim() & ref0(jsonValue2);
 
-  Parser<String> keyToken() =>
-      stringPrimitive().map((l) {
-        return (l[1] as List).join();
-      }).trim();
+  Parser<String> keyToken() => stringPrimitive().map((l) {
+    return (l[1] as List).join();
+  }).trim();
 
   Parser<String> keyToken2() =>
       (wordPrimitive().flatten() | stringPrimitive2()).map((l) {
@@ -130,11 +129,10 @@ abstract class JsonGrammarLexer extends GrammarDefinition {
   Parser<List> stringPrimitiveExtra() =>
       char("'") & ref0(characterPrimitive2).star() & char("'");
 
-  Parser<List> stringPrimitive2() =>
-      <Parser<List>>[
-        stringPrimitive(),
-        stringPrimitiveExtra(),
-      ].toChoiceParser();
+  Parser<List> stringPrimitive2() => <Parser<List>>[
+    stringPrimitive(),
+    stringPrimitiveExtra(),
+  ].toChoiceParser();
 }
 
 /// JSON grammar definition.
@@ -207,19 +205,17 @@ class JsonGrammarDefinition extends JsonGrammarLexer {
   // ignore: prefer_void_to_null
   Parser<Null> nullValue() => nullToken().map((each) => null);
 
-  Parser<String> stringValue() =>
-      stringPrimitive().map<String>((l) {
-        var l_1 = l[1];
-        if (l_1 is! List) return l_1?.toString() ?? '';
-        return l_1.join();
-      }).trim();
+  Parser<String> stringValue() => stringPrimitive().map<String>((l) {
+    var l_1 = l[1];
+    if (l_1 is! List) return l_1?.toString() ?? '';
+    return l_1.join();
+  }).trim();
 
-  Parser<String> stringValue2() =>
-      stringPrimitive2().map<String>((l) {
-        var l_1 = l[1];
-        if (l_1 is! List) return l_1?.toString() ?? '';
-        return l_1.join();
-      }).trim();
+  Parser<String> stringValue2() => stringPrimitive2().map<String>((l) {
+    var l_1 = l[1];
+    if (l_1 is! List) return l_1?.toString() ?? '';
+    return l_1.join();
+  }).trim();
 
   Parser<num> numberValue() => numberToken().map((each) => num.parse(each));
 }
@@ -241,12 +237,13 @@ class ConditionGrammarDefinition extends JsonGrammarDefinition {
         return v as Condition;
       });
 
-  Parser<Condition> conditionParenthesis() => (char('(').trim() &
-          (conditionGroup() | conditionMatch()) &
-          char(')').trim())
-      .map((l) {
-        return l[1] as Condition;
-      });
+  Parser<Condition> conditionParenthesis() =>
+      (char('(').trim() &
+              (conditionGroup() | conditionMatch()) &
+              char(')').trim())
+          .map((l) {
+            return l[1] as Condition;
+          });
 
   Parser<Condition> conditionGroup() =>
       (conditionGroupAND() | conditionGroupOR()).map((v) => v as Condition);
@@ -256,10 +253,9 @@ class ConditionGrammarDefinition extends JsonGrammarDefinition {
               (string('&&').trim() & ref0(conditionParenthesisOrValue)).plus())
           .map((l) {
             var v1 = l[0];
-            var v2 =
-                (l[1] as List)
-                    .expand((e) => e is List ? e : [e])
-                    .whereType<Condition>();
+            var v2 = (l[1] as List)
+                .expand((e) => e is List ? e : [e])
+                .whereType<Condition>();
             return GroupConditionAND([v1, ...v2]);
           });
 
@@ -268,10 +264,9 @@ class ConditionGrammarDefinition extends JsonGrammarDefinition {
               (string('||').trim() & ref0(conditionParenthesisOrValue)).plus())
           .map((l) {
             var v1 = l[0];
-            var v2 =
-                (l[1] as List)
-                    .expand((e) => e is List ? e : [e])
-                    .whereType<Condition>();
+            var v2 = (l[1] as List)
+                .expand((e) => e is List ? e : [e])
+                .whereType<Condition>();
             return GroupConditionOR([v1, ...v2]);
           });
 
@@ -318,13 +313,14 @@ class ConditionGrammarDefinition extends JsonGrammarDefinition {
   Parser<ConditionKey> conditionKey() =>
       (conditionKeyIndex() | conditionKeyField()).cast<ConditionKey>();
 
-  Parser<ConditionKeyIndex> conditionKeyIndex() => (char('[').trim() &
-          (char('-').optional() & digit().plus()).flatten() &
-          char(']').trim())
-      .map((l) {
-        var idx = int.parse(l[1]);
-        return ConditionKeyIndex(idx);
-      });
+  Parser<ConditionKeyIndex> conditionKeyIndex() =>
+      (char('[').trim() &
+              (char('-').optional() & digit().plus()).flatten() &
+              char(']').trim())
+          .map((l) {
+            var idx = int.parse(l[1]);
+            return ConditionKeyIndex(idx);
+          });
 
   Parser<ConditionKeyField> conditionKeyField() =>
       (wordPrimitive().flatten() | stringPrimitive2()).trim().map((l) {
@@ -360,8 +356,8 @@ class ConditionGrammarDefinition extends JsonGrammarDefinition {
 
   Parser conditionParameter() =>
       (conditionParameterIndex() |
-          conditionParameterKey() |
-          conditionParameterPositional());
+      conditionParameterKey() |
+      conditionParameterPositional());
 
   Parser<ConditionParameter> conditionParameterIndex() =>
       (char('?') & (char('#') & digit().star().flatten())).trim().map((l) {
diff --git a/lib/src/bones_api_condition_sql.dart b/lib/src/bones_api_condition_sql.dart
index 1c4414ed..bc1e7d95 100644
--- a/lib/src/bones_api_condition_sql.dart
+++ b/lib/src/bones_api_condition_sql.dart
@@ -340,10 +340,9 @@ class ConditionSQLEncoder extends ConditionEncoder {
 
       var fieldName = key0.name;
       var tableFieldName = tableScheme.resolveTableFieldName(fieldName);
-      var tableFieldType =
-          tableFieldName != null
-              ? tableScheme.fieldsTypes[tableFieldName]
-              : null;
+      var tableFieldType = tableFieldName != null
+          ? tableScheme.fieldsTypes[tableFieldName]
+          : null;
 
       if (tableFieldType != null) {
         return MapEntry(tableFieldType, '$q$tableAlias$q.$q$tableFieldName$q');
@@ -629,25 +628,24 @@ class ConditionSQLEncoder extends ConditionEncoder {
       );
     } else if (value is List &&
         value.whereType<ConditionParameter>().isNotEmpty) {
-      var parametersValues =
-          value.map((v) {
-            if (v is ConditionParameter) {
-              return conditionParameterToParameterValue(
-                v,
-                context,
-                fieldKey,
-                fieldType,
-                valueAsList: valueAsList,
-              );
-            } else {
-              return _valueToParameterValueImpl(
-                v,
-                fieldType,
-                key: fieldKey,
-                valueAsList: valueAsList,
-              );
-            }
-          }).resolveAll();
+      var parametersValues = value.map((v) {
+        if (v is ConditionParameter) {
+          return conditionParameterToParameterValue(
+            v,
+            context,
+            fieldKey,
+            fieldType,
+            valueAsList: valueAsList,
+          );
+        } else {
+          return _valueToParameterValueImpl(
+            v,
+            fieldType,
+            key: fieldKey,
+            valueAsList: valueAsList,
+          );
+        }
+      }).resolveAll();
 
       return parametersValues.resolveMapped(
         (values) => EncodingValueList(
@@ -741,10 +739,9 @@ class ConditionSQLEncoder extends ConditionEncoder {
   }) {
     key ??= '?';
 
-    var list =
-        value is Iterable
-            ? value.map((v) => valueToSQLPlain(v, type, key: key)).toList()
-            : [valueToSQLPlain(value, type, key: key)];
+    var list = value is Iterable
+        ? value.map((v) => valueToSQLPlain(v, type, key: key)).toList()
+        : [valueToSQLPlain(value, type, key: key)];
 
     return EncodingValueList(key, type, list, encodeEncodingValueList);
   }
diff --git a/lib/src/bones_api_config.dart b/lib/src/bones_api_config.dart
index 033b8ca9..0fa2e164 100644
--- a/lib/src/bones_api_config.dart
+++ b/lib/src/bones_api_config.dart
@@ -113,8 +113,9 @@ class APIConfig {
 
       var valueResolved = value.replaceAllMapped(_regexpValueVariable, (m) {
         var k = m[1];
-        var v =
-            k != null ? _getVariable(k, !equalsIgnoreAsciiCase(k, key)) : m[0];
+        var v = k != null
+            ? _getVariable(k, !equalsIgnoreAsciiCase(k, key))
+            : m[0];
         return v ?? '';
       });
 
@@ -542,18 +543,17 @@ class APIConfig {
   ) {
     var lines = properties.split(_regexpLineBreak);
 
-    var l =
-        lines.expand((l) {
-          if (_regexpKeyLine.hasMatch(l)) {
-            var idx = l.indexOf(_regexpKeyDelimiter);
-            var k = l.substring(0, idx).trim();
-            var v = l.substring(idx + 1);
-            var val = _parseJsonValue(v);
-            return <MapEntry<String, dynamic>>[MapEntry(k, val)];
-          } else {
-            return <MapEntry<String, dynamic>>[];
-          }
-        }).toList();
+    var l = lines.expand((l) {
+      if (_regexpKeyLine.hasMatch(l)) {
+        var idx = l.indexOf(_regexpKeyDelimiter);
+        var k = l.substring(0, idx).trim();
+        var v = l.substring(idx + 1);
+        var val = _parseJsonValue(v);
+        return <MapEntry<String, dynamic>>[MapEntry(k, val)];
+      } else {
+        return <MapEntry<String, dynamic>>[];
+      }
+    }).toList();
 
     return l;
   }
diff --git a/lib/src/bones_api_db_module.dart b/lib/src/bones_api_db_module.dart
index 758b59e5..daf1622a 100644
--- a/lib/src/bones_api_db_module.dart
+++ b/lib/src/bones_api_db_module.dart
@@ -84,10 +84,9 @@ class APIDBModule extends APIModule {
 
       var table = pathParams.removeAt(0);
 
-      var eager =
-          pathParams.any((p) => equalsIgnoreAsciiCase(p, 'eager'))
-              ? true
-              : null;
+      var eager = pathParams.any((p) => equalsIgnoreAsciiCase(p, 'eager'))
+          ? true
+          : null;
 
       var json = _containsKey(pathParams, 'json');
       return select(table, request, eager: eager, json: json);
@@ -195,8 +194,8 @@ class APIDBModule extends APIModule {
   List<EntityRepositoryProvider>? _entityRepositoryProviders;
 
   Future<List<EntityRepositoryProvider>> get entityRepositoryProviders async =>
-      _entityRepositoryProviders ??=
-          await apiRoot.loadEntityRepositoryProviders();
+      _entityRepositoryProviders ??= await apiRoot
+          .loadEntityRepositoryProviders();
 
   Future<APIResponse<dynamic>> tables({bool json = false}) async {
     if (onlyOnDevelopment && !development) {
@@ -207,21 +206,19 @@ class APIDBModule extends APIModule {
 
     var allRepositories = (await entityRepositoryProviders).allRepositories();
 
-    var allRepositoriesEntries =
-        allRepositories.entries
-            .sorted((a, b) => a.value.name.compareTo(b.value.name))
-            .toList();
+    var allRepositoriesEntries = allRepositories.entries
+        .sorted((a, b) => a.value.name.compareTo(b.value.name))
+        .toList();
 
     if (json) {
-      var map =
-          allRepositoriesEntries
-              .map((e) {
-                var type = e.key;
-                var repo = e.value;
-                return MapEntry('$type', repo.name);
-              })
-              .sorted((a, b) => a.key.compareTo(b.key))
-              .toMapFromEntries();
+      var map = allRepositoriesEntries
+          .map((e) {
+            var type = e.key;
+            var repo = e.value;
+            return MapEntry('$type', repo.name);
+          })
+          .sorted((a, b) => a.key.compareTo(b.key))
+          .toMapFromEntries();
 
       return APIResponse.ok(map, mimeType: 'json');
     }
@@ -482,12 +479,9 @@ class APIDBModule extends APIModule {
         var v2 = _resolveValue(v, fieldType);
 
         var entityType = fieldType.entityType ?? fieldType.listEntityType?.type;
-        var fieldEntityRepository =
-            entityType != null
-                ? entityRepositoryProviders.getEntityRepositoryByType(
-                  entityType,
-                )
-                : null;
+        var fieldEntityRepository = entityType != null
+            ? entityRepositoryProviders.getEntityRepositoryByType(entityType)
+            : null;
 
         if (fieldEntityRepository != null) {
           var repoName = fieldEntityRepository.name;
@@ -838,15 +832,13 @@ class APIDBModule extends APIModule {
 
       String typeStr;
       if (type.isEntityReferenceType) {
-        typeStr =
-            type.isValidGenericType
-                ? type.genericType.toString()
-                : type.toString(withT: false);
+        typeStr = type.isValidGenericType
+            ? type.genericType.toString()
+            : type.toString(withT: false);
       } else if (type.isEntityReferenceListType) {
-        typeStr =
-            type.isValidGenericType
-                ? type.genericType.toString()
-                : type.toString(withT: false);
+        typeStr = type.isValidGenericType
+            ? type.genericType.toString()
+            : type.toString(withT: false);
       } else if (type.isListEntity) {
         typeStr = type.genericType.toString();
       } else {
@@ -969,17 +961,15 @@ class APIDBModule extends APIModule {
 
     var allRepositories = (await entityRepositoryProviders).allRepositories();
 
-    var dump =
-        await allRepositories.values
-            .map((repo) => MapEntry(repo.name, repo.selectAll()))
-            .toMapFromEntries()
-            .resolveAllValues();
+    var dump = await allRepositories.values
+        .map((repo) => MapEntry(repo.name, repo.selectAll()))
+        .toMapFromEntries()
+        .resolveAllValues();
 
-    var dumpJson =
-        dump.entries
-            .map((e) => MapEntry(e.key, _entitiesToJsonMap(e.value)))
-            .where((e) => e.value.isNotEmpty)
-            .toMapFromEntries();
+    var dumpJson = dump.entries
+        .map((e) => MapEntry(e.key, _entitiesToJsonMap(e.value)))
+        .where((e) => e.value.isNotEmpty)
+        .toMapFromEntries();
 
     if (zip) {
       var apiName = apiRoot.name.toLowerCase().trim().replaceAll(
@@ -1049,8 +1039,9 @@ class APIDBModule extends APIModule {
     if (classReflection != null) {
       var entityHandler = classReflection.entityHandler;
 
-      var id =
-          o is List ? entityHandler.resolveIDs(o) : entityHandler.resolveID(o);
+      var id = o is List
+          ? entityHandler.resolveIDs(o)
+          : entityHandler.resolveID(o);
 
       return id;
     }
diff --git a/lib/src/bones_api_entity.dart b/lib/src/bones_api_entity.dart
index 43a73afc..0a857dfb 100644
--- a/lib/src/bones_api_entity.dart
+++ b/lib/src/bones_api_entity.dart
@@ -458,8 +458,10 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
       var id = resolveIDFromMap(value);
       return id != null ? <V>[id] : [];
     } else if (value is Iterable) {
-      var ids =
-          value.map((e) => resolveID<V>(e)).whereNotNullResolved().toList();
+      var ids = value
+          .map((e) => resolveID<V>(e))
+          .whereNotNullResolved()
+          .toList();
       return ids;
     } else if (value is EntityReference) {
       var id = value.id;
@@ -497,21 +499,20 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
           <double>[];
       return ids as List<V>;
     } else if (idType.isString) {
-      var ids =
-          value
-              .toString()
-              .trim()
-              .split(RegExp(r'\s+'))
-              .map((s) => s.trim())
-              .map(
-                (s) =>
-                    (s.startsWith('"') && s.endsWith('"')) ||
-                            (s.startsWith("'") && s.endsWith("'"))
-                        ? s.substring(1, s.length - 1)
-                        : s,
-              )
-              .where((s) => s.isNotEmpty)
-              .toList();
+      var ids = value
+          .toString()
+          .trim()
+          .split(RegExp(r'\s+'))
+          .map((s) => s.trim())
+          .map(
+            (s) =>
+                (s.startsWith('"') && s.endsWith('"')) ||
+                    (s.startsWith("'") && s.endsWith("'"))
+                ? s.substring(1, s.length - 1)
+                : s,
+          )
+          .where((s) => s.isNotEmpty)
+          .toList();
       return ids as List<V>;
     }
 
@@ -567,9 +568,11 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
   Type? _idType;
 
-  Type idType([O? o]) =>
-      _idType ??=
-          getFieldType(o, idFieldName(o), resolveFiledName: false)!.type;
+  Type idType([O? o]) => _idType ??= getFieldType(
+    o,
+    idFieldName(o),
+    resolveFiledName: false,
+  )!.type;
 
   String idFieldName([O? o]);
 
@@ -579,11 +582,8 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
   Map<String, TypeInfo>? _fieldsWithTypeList;
 
-  Map<String, TypeInfo> fieldsWithTypeList([O? o]) =>
-      _fieldsWithTypeList ??= fieldsWithType(
-        (_, fieldType) => fieldType.isList,
-        o,
-      );
+  Map<String, TypeInfo> fieldsWithTypeList([O? o]) => _fieldsWithTypeList ??=
+      fieldsWithType((_, fieldType) => fieldType.isList, o);
 
   Map<String, TypeInfo>? _fieldsWithTypeEntity;
 
@@ -1041,15 +1041,14 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
           entityCache: entityCache,
         );
       } else {
-        resolved =
-            valEntityHandler != null
-                ? valEntityHandler.createFromMap(
-                  value,
-                  entityProvider: entityProvider,
-                  entityCache: entityCache,
-                  resolutionRules: resolutionRulesResolved,
-                )
-                : value;
+        resolved = valEntityHandler != null
+            ? valEntityHandler.createFromMap(
+                value,
+                entityProvider: entityProvider,
+                entityCache: entityCache,
+                resolutionRules: resolutionRulesResolved,
+              )
+            : value;
       }
 
       return resolved as FutureOr<T?>;
@@ -1158,28 +1157,27 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
       var totalEntitiesToResolve = 0;
       var totalResolvedEntities = 0;
 
-      value =
-          value.map((e) {
-            if (e.isEntityIDType) {
-              totalEntitiesToResolve++;
+      value = value.map((e) {
+        if (e.isEntityIDType) {
+          totalEntitiesToResolve++;
 
-              var id = valEntityHandler?.resolveID(e) ?? e;
+          var id = valEntityHandler?.resolveID(e) ?? e;
 
-              var entity = entityCache.getCachedEntityByID(
-                id,
-                type: elementType.type,
-              );
+          var entity = entityCache.getCachedEntityByID(
+            id,
+            type: elementType.type,
+          );
 
-              if (entity != null) {
-                totalResolvedEntities++;
-                return entity;
-              } else {
-                return e;
-              }
-            } else {
-              return e;
-            }
-          }).toList();
+          if (entity != null) {
+            totalResolvedEntities++;
+            return entity;
+          } else {
+            return e;
+          }
+        } else {
+          return e;
+        }
+      }).toList();
 
       if (totalResolvedEntities == totalEntitiesToResolve &&
           value.length == totalResolvedEntities) {
@@ -1194,14 +1192,13 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
     if (valEntityHandler != null) {
       var listFutures = TypeParser.parseList(
         value,
-        elementParser:
-            (e) => valEntityHandler.resolveValueByType(
-              elementType,
-              e,
-              entityProvider: entityProvider,
-              entityCache: entityCache,
-              resolutionRules: resolutionRulesResolved,
-            ),
+        elementParser: (e) => valEntityHandler.resolveValueByType(
+          elementType,
+          e,
+          entityProvider: entityProvider,
+          entityCache: entityCache,
+          resolutionRules: resolutionRulesResolved,
+        ),
       );
 
       if (listFutures == null) return null;
@@ -1212,14 +1209,13 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
     } else {
       var listFutures = TypeParser.parseList(
         value,
-        elementParser:
-            (e) => resolveValueByType(
-              elementType,
-              e,
-              entityProvider: entityProvider,
-              entityCache: entityCache,
-              resolutionRules: resolutionRulesResolved,
-            ),
+        elementParser: (e) => resolveValueByType(
+          elementType,
+          e,
+          entityProvider: entityProvider,
+          entityCache: entityCache,
+          resolutionRules: resolutionRulesResolved,
+        ),
       );
 
       if (listFutures == null) return null;
@@ -1583,14 +1579,12 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
     final reflectionFactory = ReflectionFactory();
 
-    var mapEnumFields =
-        getFieldsTypes(o).entries
-            .where(
-              (e) =>
-                  reflectionFactory.getRegisterEnumReflection(e.value.type) !=
-                  null,
-            )
-            .toMapFromEntries();
+    var mapEnumFields = getFieldsTypes(o).entries
+        .where(
+          (e) =>
+              reflectionFactory.getRegisterEnumReflection(e.value.type) != null,
+        )
+        .toMapFromEntries();
 
     return _fieldsEnumTypes = Map<String, TypeInfo>.unmodifiable(mapEnumFields);
   }
@@ -1603,23 +1597,22 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
     var enumFields = getFieldsEnumTypes(o);
 
-    var mapEntityFields =
-        getFieldsTypes().entries
-            .map((e) {
-              var field = e.key;
-              var typeInfo = e.value;
+    var mapEntityFields = getFieldsTypes().entries
+        .map((e) {
+          var field = e.key;
+          var typeInfo = e.value;
 
-              if (enumFields.containsKey(field)) return null;
+          if (enumFields.containsKey(field)) return null;
 
-              if (typeInfo.isListEntityOrReference) return null;
+          if (typeInfo.isListEntityOrReference) return null;
 
-              var entityType = typeInfo.entityType;
-              if (entityType == null) return null;
+          var entityType = typeInfo.entityType;
+          if (entityType == null) return null;
 
-              return MapEntry(field, typeInfo);
-            })
-            .nonNulls
-            .toMapFromEntries();
+          return MapEntry(field, typeInfo);
+        })
+        .nonNulls
+        .toMapFromEntries();
 
     return _fieldsEntityTypes = Map<String, TypeInfo>.unmodifiable(
       mapEntityFields,
@@ -1634,23 +1627,22 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
     var enumFields = getFieldsEnumTypes(o);
 
-    var mapListEntityFields =
-        getFieldsTypes().entries
-            .map((e) {
-              var field = e.key;
-              var typeInfo = e.value;
+    var mapListEntityFields = getFieldsTypes().entries
+        .map((e) {
+          var field = e.key;
+          var typeInfo = e.value;
 
-              if (enumFields.containsKey(field)) return null;
+          if (enumFields.containsKey(field)) return null;
 
-              if (!typeInfo.isListEntityOrReference) return null;
+          if (!typeInfo.isListEntityOrReference) return null;
 
-              var entityType = typeInfo.entityType;
-              if (entityType == null) return null;
+          var entityType = typeInfo.entityType;
+          if (entityType == null) return null;
 
-              return MapEntry(field, typeInfo);
-            })
-            .nonNulls
-            .toMapFromEntries();
+          return MapEntry(field, typeInfo);
+        })
+        .nonNulls
+        .toMapFromEntries();
 
     return _fieldsListEntityTypes = Map<String, TypeInfo>.unmodifiable(
       mapListEntityFields,
@@ -1662,11 +1654,10 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
   Map<String, List<EntityAnnotation>>? getAllFieldsEntityAnnotations([O? o]) {
     var fieldsNames = this.fieldsNames(o);
 
-    var entries =
-        fieldsNames.map((f) {
-          var annotations = getFieldEntityAnnotations(o, f);
-          return annotations == null ? null : MapEntry(f, annotations);
-        }).nonNulls;
+    var entries = fieldsNames.map((f) {
+      var annotations = getFieldEntityAnnotations(o, f);
+      return annotations == null ? null : MapEntry(f, annotations);
+    }).nonNulls;
 
     var map = Map<String, List<EntityAnnotation>>.fromEntries(entries);
 
@@ -2088,8 +2079,9 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
       return DynamicInt.fromInt(value.millisecondsSinceEpoch);
     }
 
-    DynamicNumber? n =
-        value == null ? def : (Decimal.from(value.toString().trim()) ?? def);
+    DynamicNumber? n = value == null
+        ? def
+        : (Decimal.from(value.toString().trim()) ?? def);
 
     if (n == null) {
       throw ArgumentError(
@@ -2187,25 +2179,23 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
     var reflectionFactory = ReflectionFactory();
 
-    EntityHandler? entityHandler1 =
-        value1.isPrimitiveValue
-            ? null
-            : reflectionFactory
-                    .getRegisterClassReflection(value1.runtimeType)
-                    ?.entityHandler ??
-                EntityHandlerProvider.globalProvider.getEntityHandler(
-                  obj: value1,
-                );
-
-    EntityHandler? entityHandler2 =
-        value2.isPrimitiveValue
-            ? null
-            : reflectionFactory
-                    .getRegisterClassReflection(value2.runtimeType)
-                    ?.entityHandler ??
-                EntityHandlerProvider.globalProvider.getEntityHandler(
-                  obj: value2,
-                );
+    EntityHandler? entityHandler1 = value1.isPrimitiveValue
+        ? null
+        : reflectionFactory
+                  .getRegisterClassReflection(value1.runtimeType)
+                  ?.entityHandler ??
+              EntityHandlerProvider.globalProvider.getEntityHandler(
+                obj: value1,
+              );
+
+    EntityHandler? entityHandler2 = value2.isPrimitiveValue
+        ? null
+        : reflectionFactory
+                  .getRegisterClassReflection(value2.runtimeType)
+                  ?.entityHandler ??
+              EntityHandlerProvider.globalProvider.getEntityHandler(
+                obj: value2,
+              );
 
     if (entityHandler1 != null) {
       var id1 = entityHandler1.getID(value1);
@@ -2283,14 +2273,12 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
   static bool? equalsValuesTime(Object value1, Object value2) {
     if (value1 is Time || value2 is Time) {
-      var t1 =
-          value1 is Time
-              ? value1.totalMilliseconds
-              : TypeParser.parseInt(value1);
-      var t2 =
-          value2 is Time
-              ? value2.totalMilliseconds
-              : TypeParser.parseInt(value2);
+      var t1 = value1 is Time
+          ? value1.totalMilliseconds
+          : TypeParser.parseInt(value1);
+      var t2 = value2 is Time
+          ? value2.totalMilliseconds
+          : TypeParser.parseInt(value2);
       return t1 == t2;
     }
 
@@ -2336,8 +2324,8 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
       return isEqualsDeep(
         value1,
         value2,
-        valueEquality:
-            (a, b) => equalsValuesBasic(a, b, entityHandler: entityHandler),
+        valueEquality: (a, b) =>
+            equalsValuesBasic(a, b, entityHandler: entityHandler),
       );
     }
 
@@ -2461,25 +2449,26 @@ abstract class EntityHandler<O> with FieldsFromMap, EntityRulesResolver {
 
         var msgConstructors = '';
         if (constructors != null && constructors.isNotEmpty) {
-          var allParameters =
-              constructors.entries.expand((c) => c.value.keys).toSet();
-
-          var missingParameters =
-              allParameters.where((p) => !parameters.contains(p)).toList();
-
-          var list =
-              constructors.entries.map((e) {
-                var name = e.key;
-                var args = e.value.entries
-                    .map((e) {
-                      var argName = e.key;
-                      var argType = e.value.toString(withT: false);
-                      return '$argType $argName';
-                    })
-                    .join(', ');
-
-                return '$type${name.isNotEmpty ? '.$name' : ''}($args)';
-              }).toList();
+          var allParameters = constructors.entries
+              .expand((c) => c.value.keys)
+              .toSet();
+
+          var missingParameters = allParameters
+              .where((p) => !parameters.contains(p))
+              .toList();
+
+          var list = constructors.entries.map((e) {
+            var name = e.key;
+            var args = e.value.entries
+                .map((e) {
+                  var argName = e.key;
+                  var argType = e.value.toString(withT: false);
+                  return '$argType $argName';
+                })
+                .join(', ');
+
+            return '$type${name.isNotEmpty ? '.$name' : ''}($args)';
+          }).toList();
 
           msgConstructors =
               '\n  Missing parameters: $missingParameters'
@@ -2753,8 +2742,9 @@ class GenericEntityHandler<O extends Entity> extends EntityHandler<O> {
     if (o != null && _idFieldsName == null) {
       _idFieldsName = o.idFieldName;
 
-      final fieldsNames =
-          _fieldsNames ??= List<String>.unmodifiable(o.fieldsNames);
+      final fieldsNames = _fieldsNames ??= List<String>.unmodifiable(
+        o.fieldsNames,
+      );
 
       _fieldsTypes ??= Map<String, TypeInfo>.unmodifiable(
         Map<String, TypeInfo>.fromEntries(
@@ -2924,9 +2914,8 @@ class ClassReflectionEntityHandler<O> extends EntityHandler<O> {
   @override
   String get typeName => reflection.className;
 
-  ClassReflection<O> get reflection =>
-      _reflection ??=
-          ReflectionFactory().getRegisterClassReflection<O>(classType)!;
+  ClassReflection<O> get reflection => _reflection ??= ReflectionFactory()
+      .getRegisterClassReflection<O>(classType)!;
 
   ClassReflection<O> reflectionWithObject([O? o]) =>
       o == null ? reflection : reflection.withObject(o);
@@ -3204,13 +3193,9 @@ class ClassReflectionEntityHandler<O> extends EntityHandler<O> {
     return _constructors ??= Map<String, Map<String, TypeInfo>>.unmodifiable(
       reflectionWithObject(o).allConstructors().map((c) {
         var name = c.name;
-        var args =
-            c.allParameters
-                .map(
-                  (p) =>
-                      MapEntry<String, TypeInfo>(p.jsonName, p.type.typeInfo),
-                )
-                .toMapFromEntries();
+        var args = c.allParameters
+            .map((p) => MapEntry<String, TypeInfo>(p.jsonName, p.type.typeInfo))
+            .toMapFromEntries();
         return MapEntry(name, Map<String, TypeInfo>.unmodifiable(args));
       }).toMapFromEntries(),
     );
@@ -3229,9 +3214,8 @@ class ClassReflectionEntityHandler<O> extends EntityHandler<O> {
     return reflection.createInstanceFromMap(
       fields,
       fieldNameResolver: Json.defaultFieldNameResolver,
-      fieldValueResolver:
-          (f, v, t) =>
-              Json.defaultFieldValueResolver(f, v, t, jsonDecoder!, provider),
+      fieldValueResolver: (f, v, t) =>
+          Json.defaultFieldValueResolver(f, v, t, jsonDecoder!, provider),
     );
   }
 
@@ -3659,18 +3643,17 @@ abstract class EntitySource<O extends Object> extends EntityAccessor<O> {
     limit: limit,
     query: query,
     onEvent: onEvent,
-    pageLoader:
-        (page, limit) => selectByQuery(
-          query,
-          parameters: parameters,
-          positionalParameters: positionalParameters,
-          namedParameters: namedParameters,
-          transaction: transaction,
-          limit: limit,
-          page: page,
-          orderByID: orderByID ?? true,
-          orderDirection: orderDirection,
-        ).resolveMapped((os) => os.toList()),
+    pageLoader: (page, limit) => selectByQuery(
+      query,
+      parameters: parameters,
+      positionalParameters: positionalParameters,
+      namedParameters: namedParameters,
+      transaction: transaction,
+      limit: limit,
+      page: page,
+      orderByID: orderByID ?? true,
+      orderDirection: orderDirection,
+    ).resolveMapped((os) => os.toList()),
   );
 
   /// {@macro bones_api.paginate}
@@ -3688,18 +3671,17 @@ abstract class EntitySource<O extends Object> extends EntityAccessor<O> {
     limit: limit,
     query: '$matcher',
     onEvent: onEvent,
-    pageLoader:
-        (page, limit) => select(
-          matcher,
-          parameters: parameters,
-          positionalParameters: positionalParameters,
-          namedParameters: namedParameters,
-          transaction: transaction,
-          limit: limit,
-          page: page,
-          orderByID: orderByID ?? true,
-          orderDirection: orderDirection,
-        ).resolveMapped((os) => os.toList()),
+    pageLoader: (page, limit) => select(
+      matcher,
+      parameters: parameters,
+      positionalParameters: positionalParameters,
+      namedParameters: namedParameters,
+      transaction: transaction,
+      limit: limit,
+      page: page,
+      orderByID: orderByID ?? true,
+      orderDirection: orderDirection,
+    ).resolveMapped((os) => os.toList()),
   );
 
   /// {@macro bones_api.paginate}
@@ -3713,14 +3695,13 @@ abstract class EntitySource<O extends Object> extends EntityAccessor<O> {
     limit: limit,
     query: 'ALL',
     onEvent: onEvent,
-    pageLoader:
-        (page, limit) => selectAll(
-          transaction: transaction,
-          limit: limit,
-          page: page,
-          orderByID: orderByID ?? true,
-          orderDirection: orderDirection,
-        ).resolveMapped((os) => os.toList()),
+    pageLoader: (page, limit) => selectAll(
+      transaction: transaction,
+      limit: limit,
+      page: page,
+      orderByID: orderByID ?? true,
+      orderDirection: orderDirection,
+    ).resolveMapped((os) => os.toList()),
   );
 
   FutureOr<Iterable<dynamic>> selectRelationship<E>(
@@ -4296,12 +4277,9 @@ class EntityRepositoryProvider
       if (name != null) {
         var nameSimplified = EntityAccessor.simplifiedName(name);
 
-        entityRepository =
-            _entityRepositories.values
-                .where(
-                  (e) => e.name == name || e.nameSimplified == nameSimplified,
-                )
-                .firstOrNull;
+        entityRepository = _entityRepositories.values
+            .where((e) => e.name == name || e.nameSimplified == nameSimplified)
+            .firstOrNull;
 
         if (entityRepository != null && !entityRepository.isClosed) {
           return entityRepository as EntityRepository<O>;
@@ -4704,11 +4682,10 @@ extension _IterableEntityRepositoryProviderExtension
 
     var notClosed = _whereNotClosed(this, length, removeClosedProviders);
 
-    var entityRepositories =
-        notClosed
-            .map((e) => e.getEntityRepositoryByType<T>(type))
-            .nonNulls
-            .toList();
+    var entityRepositories = notClosed
+        .map((e) => e.getEntityRepositoryByType<T>(type))
+        .nonNulls
+        .toList();
 
     return _resolveEntityRepository<T>(
       entityRepositories,
@@ -4741,23 +4718,20 @@ extension _IterableEntityRepositoryProviderExtension
       }
 
       if (entityRepositoryProvider != null) {
-        var sameProvider =
-            entityRepositories
-                .where(
-                  (r) =>
-                      r.provider == entityRepositoryProvider &&
-                      (entityHandler == null ||
-                          r.entityHandler == entityHandler),
-                )
-                .toList();
+        var sameProvider = entityRepositories
+            .where(
+              (r) =>
+                  r.provider == entityRepositoryProvider &&
+                  (entityHandler == null || r.entityHandler == entityHandler),
+            )
+            .toList();
         if (sameProvider.length == 1) {
           return sameProvider.first;
         }
       } else if (entityHandler != null) {
-        var sameProvider =
-            entityRepositories
-                .where((r) => r.entityHandler == entityHandler)
-                .toList();
+        var sameProvider = entityRepositories
+            .where((r) => r.entityHandler == entityHandler)
+            .toList();
         if (sameProvider.length == 1) {
           return sameProvider.first;
         }
@@ -4843,34 +4817,35 @@ extension EntityRepositoryProviderExtension on EntityRepositoryProvider {
       growable: false,
     );
 
-    var entriesRepositoriesOrdered =
-        entries.entries
-            .map((e) {
-              var typeName = e.key;
-              var entities = e.value;
-              var entityRepository = getEntityRepository(name: typeName);
-              return MapEntry(typeName, (entities, entityRepository));
-            })
-            .sorted((a, b) {
-              var rep1 = a.value.$2;
-              var rep2 = b.value.$2;
-
-              var idx1 =
-                  rep1 != null ? allRepositoriesBuildOrder.indexOf(rep1) : -1;
-              var idx2 =
-                  rep2 != null ? allRepositoriesBuildOrder.indexOf(rep2) : -1;
-
-              if (idx1 < 0) {
-                idx1 = 9999999;
-              }
-
-              if (idx2 < 0) {
-                idx2 = 9999999;
-              }
-
-              return idx1.compareTo(idx2);
-            })
-            .toMapFromEntries();
+    var entriesRepositoriesOrdered = entries.entries
+        .map((e) {
+          var typeName = e.key;
+          var entities = e.value;
+          var entityRepository = getEntityRepository(name: typeName);
+          return MapEntry(typeName, (entities, entityRepository));
+        })
+        .sorted((a, b) {
+          var rep1 = a.value.$2;
+          var rep2 = b.value.$2;
+
+          var idx1 = rep1 != null
+              ? allRepositoriesBuildOrder.indexOf(rep1)
+              : -1;
+          var idx2 = rep2 != null
+              ? allRepositoriesBuildOrder.indexOf(rep2)
+              : -1;
+
+          if (idx1 < 0) {
+            idx1 = 9999999;
+          }
+
+          if (idx2 < 0) {
+            idx2 = 9999999;
+          }
+
+          return idx1.compareTo(idx2);
+        })
+        .toMapFromEntries();
 
     _log.info('Repositories build order:');
     for (var e in entriesRepositoriesOrdered.entries) {
@@ -5034,17 +5009,14 @@ extension EntityRepositoryProviderExtension on EntityRepositoryProvider {
       var key = k.toString();
       var values = v is Iterable ? v : [v];
 
-      var entities =
-          values
-              .map(
-                (e) => (e as Map).map(
-                  (key, value) => MapEntry<String, dynamic>(
-                    key.toString(),
-                    value as dynamic,
-                  ),
-                ),
-              )
-              .toList();
+      var entities = values
+          .map(
+            (e) => (e as Map).map(
+              (key, value) =>
+                  MapEntry<String, dynamic>(key.toString(), value as dynamic),
+            ),
+          )
+          .toList();
 
       return MapEntry(key, entities);
     });
@@ -5333,25 +5305,25 @@ abstract class EntityRepository<O extends Object> extends EntityAccessor<O>
     EntityResolutionRules? resolutionRules,
   ) => Transaction.executeBlock((transaction) {
     if (entitiesJson.length <= 100) {
-      var osAsync =
-          entitiesJson
-              .map(
-                (e) => createFromMap(
-                  e,
-                  entityCache: transaction,
-                  entityProvider: provider,
-                  resolutionRules: resolutionRules,
-                ),
-              )
-              .resolveAll();
+      var osAsync = entitiesJson
+          .map(
+            (e) => createFromMap(
+              e,
+              entityCache: transaction,
+              entityProvider: provider,
+              resolutionRules: resolutionRules,
+            ),
+          )
+          .resolveAll();
 
       return osAsync.resolveMapped((os) {
         return storeAll(os, transaction: transaction).resolveWithValue(os);
       });
     }
 
-    var entitiesJsonBlocks =
-        entitiesJson.splitBeforeIndexed((i, e) => i % 50 == 0).toList();
+    var entitiesJsonBlocks = entitiesJson
+        .splitBeforeIndexed((i, e) => i % 50 == 0)
+        .toList();
 
     final entitiesJsonLength = entitiesJson.length;
     int processCount = 0;
@@ -5367,29 +5339,26 @@ abstract class EntityRepository<O extends Object> extends EntityAccessor<O>
           final elapsedTime = DateTime.now().difference(initTime);
 
           final estimatedTime = Duration(
-            milliseconds:
-                count == 0
-                    ? 0
-                    : ((elapsedTime.inMilliseconds / count) *
-                            entitiesJsonLength)
-                        .toInt(),
+            milliseconds: count == 0
+                ? 0
+                : ((elapsedTime.inMilliseconds / count) * entitiesJsonLength)
+                      .toInt(),
           );
 
           _log.info(
             'Populating `$name`...  $count / $entitiesJsonLength (${progress.toStringAsFixed(2)}%) -- ${elapsedTime.toHumanReadable()} / ${estimatedTime.toHumanReadable()}',
           );
 
-          var osAsync =
-              entitiesBlock
-                  .map(
-                    (e) => createFromMap(
-                      e,
-                      entityCache: transaction,
-                      entityProvider: provider,
-                      resolutionRules: resolutionRules,
-                    ),
-                  )
-                  .resolveAll();
+          var osAsync = entitiesBlock
+              .map(
+                (e) => createFromMap(
+                  e,
+                  entityCache: transaction,
+                  entityProvider: provider,
+                  resolutionRules: resolutionRules,
+                ),
+              )
+              .resolveAll();
 
           return osAsync.resolveMapped((os) {
             return storeAll(os, transaction: transaction).resolveWithValue(os);
@@ -5835,19 +5804,18 @@ abstract class EntityRepository<O extends Object> extends EntityAccessor<O>
     limit: limit,
     onEvent: onEvent,
     query: query,
-    pageLoader:
-        (page, limit) => selectByQuery(
-          query,
-          parameters: parameters,
-          positionalParameters: positionalParameters,
-          namedParameters: namedParameters,
-          transaction: transaction,
-          limit: limit,
-          page: page,
-          orderByID: orderByID ?? true,
-          orderDirection: orderDirection,
-          resolutionRules: resolutionRules,
-        ).resolveMapped((os) => os.toList()),
+    pageLoader: (page, limit) => selectByQuery(
+      query,
+      parameters: parameters,
+      positionalParameters: positionalParameters,
+      namedParameters: namedParameters,
+      transaction: transaction,
+      limit: limit,
+      page: page,
+      orderByID: orderByID ?? true,
+      orderDirection: orderDirection,
+      resolutionRules: resolutionRules,
+    ).resolveMapped((os) => os.toList()),
   );
 
   /// {@macro bones_api.paginate}
@@ -5869,19 +5837,18 @@ abstract class EntityRepository<O extends Object> extends EntityAccessor<O>
     limit: limit,
     onEvent: onEvent,
     query: '$matcher',
-    pageLoader:
-        (page, limit) => select(
-          matcher,
-          parameters: parameters,
-          positionalParameters: positionalParameters,
-          namedParameters: namedParameters,
-          transaction: transaction,
-          limit: limit,
-          page: page,
-          orderByID: orderByID ?? true,
-          orderDirection: orderDirection,
-          resolutionRules: resolutionRules,
-        ).resolveMapped((os) => os.toList()),
+    pageLoader: (page, limit) => select(
+      matcher,
+      parameters: parameters,
+      positionalParameters: positionalParameters,
+      namedParameters: namedParameters,
+      transaction: transaction,
+      limit: limit,
+      page: page,
+      orderByID: orderByID ?? true,
+      orderDirection: orderDirection,
+      resolutionRules: resolutionRules,
+    ).resolveMapped((os) => os.toList()),
   );
 
   /// {@macro bones_api.paginate}
@@ -5899,15 +5866,14 @@ abstract class EntityRepository<O extends Object> extends EntityAccessor<O>
     limit: limit,
     onEvent: onEvent,
     query: 'ALL',
-    pageLoader:
-        (page, limit) => selectAll(
-          transaction: transaction,
-          limit: limit,
-          page: page,
-          orderByID: orderByID ?? true,
-          orderDirection: orderDirection,
-          resolutionRules: resolutionRules,
-        ).resolveMapped((os) => os.toList()),
+    pageLoader: (page, limit) => selectAll(
+      transaction: transaction,
+      limit: limit,
+      page: page,
+      orderByID: orderByID ?? true,
+      orderDirection: orderDirection,
+      resolutionRules: resolutionRules,
+    ).resolveMapped((os) => os.toList()),
   );
 
   @override
@@ -6464,8 +6430,8 @@ class Transaction extends JsonEntityCacheSimple implements EntityProvider {
 
   Future<bool> _waitAllExecutedImpl() async {
     while (_executedOperations.length < _operations.length) {
-      var completer =
-          _waitingExecutedOperation ??= Completer<TransactionOperation>();
+      var completer = _waitingExecutedOperation ??=
+          Completer<TransactionOperation>();
       await completer.future;
     }
     return true;
@@ -6511,8 +6477,8 @@ class Transaction extends JsonEntityCacheSimple implements EntityProvider {
         return false;
       }
 
-      var completer =
-          _waitingExecutedOperation ??= Completer<TransactionOperation?>();
+      var completer = _waitingExecutedOperation ??=
+          Completer<TransactionOperation?>();
 
       var executedOp = await completer.future.timeout(
         remainingTime,
@@ -6828,12 +6794,11 @@ class Transaction extends JsonEntityCacheSimple implements EntityProvider {
     if (onError != null) {
       return zone.asyncTry<R>(
         block,
-        onError:
-            (e, s) => _executeCommit(
-              zone,
-              e,
-              s,
-            ).resolveMapped((val) => onError(this, e, s)),
+        onError: (e, s) => _executeCommit(
+          zone,
+          e,
+          s,
+        ).resolveMapped((val) => onError(this, e, s)),
         onFinally: () => _executeCommit(zone),
       );
     } else {
@@ -6952,16 +6917,15 @@ class Transaction extends JsonEntityCacheSimple implements EntityProvider {
   }) {
     final previousError = _error;
 
-    final errorResolved =
-        errorResolver != null
-            ? errorResolver(
-                  error,
-                  stackTrace,
-                  debugInfo != null ? [operation, debugInfo] : operation,
-                  previousError,
-                ) ??
-                error
-            : error;
+    final errorResolved = errorResolver != null
+        ? errorResolver(
+                error,
+                stackTrace,
+                debugInfo != null ? [operation, debugInfo] : operation,
+                previousError,
+              ) ??
+              error
+        : error;
 
     _errorsTransactions[errorResolved] = this;
 
@@ -7289,13 +7253,14 @@ class TransactionOperationSubTransaction<O> extends TransactionOperation {
       'TransactionOperationSubTransaction$_executedStatus[#$id@#${transaction.id}:subTransaction@$repositoryName]->$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperationSubTransaction$_executedStatus[#$id@#${transaction.id}:subTransaction@$repositoryName]->${subTransaction.toString(compact: true)}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperationSubTransaction$_executedStatus[#$id@#${transaction.id}:subTransaction@$repositoryName]->${subTransaction.toString(compact: true)}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationSelect<O> extends TransactionOperation {
@@ -7320,13 +7285,14 @@ class TransactionOperationSelect<O> extends TransactionOperation {
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:select@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:select@$repositoryName]{matcher: $matcher$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:select@$repositoryName]{matcher: $matcher$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationCount<O> extends TransactionOperation {
@@ -7345,13 +7311,14 @@ class TransactionOperationCount<O> extends TransactionOperation {
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:count@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:count@$repositoryName]{matcher: $matcher$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:count@$repositoryName]{matcher: $matcher$_commandToString}$durationMsInfo',
+  )!;
 }
 
 abstract class TransactionOperationWithEntity<O> extends TransactionOperation {
@@ -7402,13 +7369,14 @@ class TransactionOperationStore<O> extends TransactionOperationSaveEntity<O> {
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:store@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:store@$repositoryName]{entity: $entity$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:store@$repositoryName]{entity: $entity$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationUpdate<O> extends TransactionOperationSaveEntity<O> {
@@ -7432,13 +7400,14 @@ class TransactionOperationUpdate<O> extends TransactionOperationSaveEntity<O> {
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:update@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:update@$repositoryName]{entity: $entity$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:update@$repositoryName]{entity: $entity$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationStoreRelationship<O, E>
@@ -7465,13 +7434,14 @@ class TransactionOperationStoreRelationship<O, E>
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:storeRelationship@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:storeRelationship@$repositoryName]{entity: $entity, other: $others$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:storeRelationship@$repositoryName]{entity: $entity, other: $others$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationConstrainRelationship<O, E>
@@ -7498,13 +7468,14 @@ class TransactionOperationConstrainRelationship<O, E>
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:constrainRelationship@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:constrainRelationship@$repositoryName]{entity: $entity, other: $others$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:constrainRelationship@$repositoryName]{entity: $entity, other: $others$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationSelectRelationship<O>
@@ -7528,13 +7499,14 @@ class TransactionOperationSelectRelationship<O>
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:selectRelationship@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:selectRelationship@$repositoryName]{entity: $entity$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:selectRelationship@$repositoryName]{entity: $entity$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationSelectRelationships<O> extends TransactionOperation {
@@ -7560,13 +7532,14 @@ class TransactionOperationSelectRelationships<O> extends TransactionOperation {
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:selectRelationships@$repositoryName->$valueRepositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:selectRelationships@$repositoryName->$valueRepositoryName]{entities: $entities$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:selectRelationships@$repositoryName->$valueRepositoryName]{entities: $entities$_commandToString}$durationMsInfo',
+  )!;
 }
 
 class TransactionOperationDelete<O> extends TransactionOperation {
@@ -7591,13 +7564,14 @@ class TransactionOperationDelete<O> extends TransactionOperation {
       'TransactionOperation$_executedStatus[#$id@#${transaction.id}:delete@$repositoryName]$durationMsInfo';
 
   @override
-  String toString({Set<Object>? processedObjects}) =>
-      RecursiveToString.recursiveToString(
-        processedObjects,
-        this,
-        () =>
-            'TransactionOperation$_executedStatus[#$id@#${transaction.id}:delete@$repositoryName]{matcher: $matcher$_commandToString}$durationMsInfo',
-      )!;
+  String toString({
+    Set<Object>? processedObjects,
+  }) => RecursiveToString.recursiveToString(
+    processedObjects,
+    this,
+    () =>
+        'TransactionOperation$_executedStatus[#$id@#${transaction.id}:delete@$repositoryName]{matcher: $matcher$_commandToString}$durationMsInfo',
+  )!;
 }
 
 enum TransactionOperationType {
@@ -7726,8 +7700,8 @@ abstract class IterableEntityRepository<O extends Object>
     final fieldsEntity = entityHandler.fieldsWithTypeEntityOrReference();
     final fieldsEntityRef = entityHandler.fieldsWithEntityReference();
 
-    final fieldsListEntity =
-        entityHandler.fieldsWithTypeListEntityOrReference();
+    final fieldsListEntity = entityHandler
+        .fieldsWithTypeListEntityOrReference();
     final fieldsListEntityRef = entityHandler.fieldsWithEntityReferenceList();
 
     if (fieldsEntity.isEmpty && fieldsListEntity.isEmpty) return false;
@@ -7791,12 +7765,11 @@ abstract class IterableEntityRepository<O extends Object>
   }) {
     checkNotClosed();
 
-    var osIDs =
-        iterable().map((o) {
-          var oId = getID(o, entityHandler: entityHandler);
-          var matches = ids.contains(oId);
-          return matches ? oId as I : null;
-        }).nonNulls;
+    var osIDs = iterable().map((o) {
+      var oId = getID(o, entityHandler: entityHandler);
+      var matches = ids.contains(oId);
+      return matches ? oId as I : null;
+    }).nonNulls;
 
     return osIDs;
   }
@@ -7959,10 +7932,9 @@ abstract class IterableEntityRepository<O extends Object>
       o,
     );
 
-    var uniques =
-        fieldsEntityAnnotations?.entries
-            .where((e) => e.value.hasUnique)
-            .toList();
+    var uniques = fieldsEntityAnnotations?.entries
+        .where((e) => e.value.hasUnique)
+        .toList();
     if (uniques == null || uniques.isEmpty) return;
 
     for (var e in uniques) {
@@ -8087,26 +8059,24 @@ abstract class IterableEntityRepository<O extends Object>
     TypeInfo? fieldType,
     Transaction? transaction,
   }) {
-    oIds ??=
-        os!
-            .map((o) => getID(o, entityHandler: entityHandler)! as Object)
-            .toList();
+    oIds ??= os!
+        .map((o) => getID(o, entityHandler: entityHandler)! as Object)
+        .toList();
 
     if (oIds.isEmpty) {
       return <dynamic, Iterable<dynamic>>{};
     }
 
-    var entries =
-        oIds.map((oId) {
-          var objs = selectRelationship(
-            null,
-            field,
-            oId: oId,
-            fieldType: fieldType,
-            transaction: transaction,
-          );
-          return MapEntry(oId, objs);
-        }).toList();
+    var entries = oIds.map((oId) {
+      var objs = selectRelationship(
+        null,
+        field,
+        oId: oId,
+        fieldType: fieldType,
+        transaction: transaction,
+      );
+      return MapEntry(oId, objs);
+    }).toList();
 
     var results = Map<dynamic, FutureOr<Iterable<dynamic>>>.fromEntries(
       entries,
@@ -8182,8 +8152,11 @@ abstract class IterableEntityRepository<O extends Object>
       var value = entityHandler.getField(o, fieldName);
       if (value == null) return null;
 
-      var fieldType =
-          entityHandler.getFieldType(o, fieldName, resolveFiledName: false)!;
+      var fieldType = entityHandler.getFieldType(
+        o,
+        fieldName,
+        resolveFiledName: false,
+      )!;
 
       if (!EntityHandler.isValidEntityType(fieldType.type)) {
         return null;
@@ -8197,14 +8170,13 @@ abstract class IterableEntityRepository<O extends Object>
         );
         if (elementRepository == null) return null;
 
-        var futures =
-            value.map((e) {
-              return elementRepository.ensureStored(
-                e,
-                transaction: transaction,
-                operation: operation,
-              );
-            }).toList();
+        var futures = value.map((e) {
+          return elementRepository.ensureStored(
+            e,
+            transaction: transaction,
+            operation: operation,
+          );
+        }).toList();
 
         return futures.resolveAll();
       } else {
@@ -8326,18 +8298,17 @@ abstract class IterableEntityRepository<O extends Object>
     int? offset,
     bool? orderByID,
     OrderDirection? orderDirection,
-  }) =>
-      applySelectOrderAndPagination(
-        itr,
-        (o) => getID(o, entityHandler: entityHandler),
-        limit: limit,
-        offset: offset,
-        orderByID: orderByID,
-        orderDirection: orderDirection,
-        // Preserves the pre-existing behavior of this repository,
-        // where a `limit` of 0 means "no limit":
-        zeroLimitIsUnlimited: true,
-      ).toList();
+  }) => applySelectOrderAndPagination(
+    itr,
+    (o) => getID(o, entityHandler: entityHandler),
+    limit: limit,
+    offset: offset,
+    orderByID: orderByID,
+    orderDirection: orderDirection,
+    // Preserves the pre-existing behavior of this repository,
+    // where a `limit` of 0 means "no limit":
+    zeroLimitIsUnlimited: true,
+  ).toList();
 
   @override
   Map<String, dynamic> information({bool extended = false}) {
diff --git a/lib/src/bones_api_entity_annotation.dart b/lib/src/bones_api_entity_annotation.dart
index 89bdfbb2..26897cd3 100644
--- a/lib/src/bones_api_entity_annotation.dart
+++ b/lib/src/bones_api_entity_annotation.dart
@@ -346,8 +346,9 @@ class EntityFieldInvalid extends Error implements RecursiveToString {
       entityStr = '($entityStr)';
     }
 
-    var fieldStr =
-        fieldName != null && fieldName!.isNotEmpty ? '($fieldName)' : '';
+    var fieldStr = fieldName != null && fieldName!.isNotEmpty
+        ? '($fieldName)'
+        : '';
 
     var msg = 'reason: $reason';
 
@@ -367,8 +368,9 @@ class EntityFieldInvalid extends Error implements RecursiveToString {
       entityStr = '($entityStr)';
     }
 
-    var fieldStr =
-        fieldName != null && fieldName!.isNotEmpty ? '($fieldName)' : '';
+    var fieldStr = fieldName != null && fieldName!.isNotEmpty
+        ? '($fieldName)'
+        : '';
 
     var operationStr = '';
     if (operation != null) {
@@ -381,10 +383,9 @@ class EntityFieldInvalid extends Error implements RecursiveToString {
       operationStr = '\n  -- Operation>>\n$s';
     }
 
-    var parentStr =
-        parentError != null
-            ? '\n  -- Parent ERROR>> [${parentError.runtimeTypeNameUnsafe}] $parentError'
-            : '';
+    var parentStr = parentError != null
+        ? '\n  -- Parent ERROR>> [${parentError.runtimeTypeNameUnsafe}] $parentError'
+        : '';
 
     return 'Invalid entity$entityStr field$fieldStr> $message$operationStr$parentStr';
   }
diff --git a/lib/src/bones_api_entity_db.dart b/lib/src/bones_api_entity_db.dart
index 0b7beaa4..99387753 100644
--- a/lib/src/bones_api_entity_db.dart
+++ b/lib/src/bones_api_entity_db.dart
@@ -1200,10 +1200,9 @@ class DBAdapterRegister<C extends Object, A extends DBAdapter<C>> {
   DBAdapterRegister({this.superRegister});
 
   /// Creates a child register.
-  DBAdapterRegister<C2, A2> createRegister<
-    C2 extends Object,
-    A2 extends DBAdapter<C2>
-  >() => DBAdapterRegister<C2, A2>(superRegister: this);
+  DBAdapterRegister<C2, A2>
+  createRegister<C2 extends Object, A2 extends DBAdapter<C2>>() =>
+      DBAdapterRegister<C2, A2>(superRegister: this);
 
   final Map<String, DBAdapterInstantiator<C, A>> _registeredAdaptersByName = {};
   final Map<Type, DBAdapterInstantiator<C, A>> _registeredAdaptersByType = {};
@@ -1786,15 +1785,14 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
       var ids = matcher.idsValues.whereType<I>().toList();
       // `existIDs` has no ordering/pagination hook, so it is applied here:
       return existIDs(ids, transaction: transaction).resolveMapped(
-        (existing) =>
-            applySelectOrderAndPagination(
-              existing,
-              (id) => id,
-              limit: limit,
-              offset: offset,
-              orderByID: orderByID,
-              orderDirection: orderDirection,
-            ).toList(),
+        (existing) => applySelectOrderAndPagination(
+          existing,
+          (id) => id,
+          limit: limit,
+          offset: offset,
+          orderByID: orderByID,
+          orderDirection: orderDirection,
+        ).toList(),
       );
     }
 
@@ -2057,8 +2055,9 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
     if (results is! Iterable<Map<String, dynamic>>) {
       entries = results.nonNulls.toList();
     } else {
-      entries =
-          results is List<Map<String, dynamic>> ? results : results.toList();
+      entries = results is List<Map<String, dynamic>>
+          ? results
+          : results.toList();
     }
 
     var fieldsListEntity = _fieldsListEntity;
@@ -2206,10 +2205,9 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
                   resolutionRules: resolutionRulesResolved,
                 )
                 .resolveMapped(
-                  (entities) =>
-                      idsUniques
-                          .mapIndexed((i, id) => MapEntry(id, entities[i]))
-                          .toList(),
+                  (entities) => idsUniques
+                      .mapIndexed((i, id) => MapEntry(id, entities[i]))
+                      .toList(),
                 );
 
             return MapEntry(tableColumn, entities);
@@ -2265,9 +2263,8 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
 
   int? _fieldsEntityNoRefLengthCache;
 
-  int get _fieldsEntityNoRefLength =>
-      _fieldsEntityNoRefLengthCache ??=
-          _fieldsEntity.length - _fieldsEntityRef.length;
+  int get _fieldsEntityNoRefLength => _fieldsEntityNoRefLengthCache ??=
+      _fieldsEntity.length - _fieldsEntityRef.length;
 
   Map<String, TypeInfo> get _fieldsListEntity =>
       entityHandler.fieldsWithTypeListEntityOrReference();
@@ -2277,21 +2274,19 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
 
   int? _fieldsListEntityNoRefLengthCache;
 
-  int get _fieldsListEntityNoRefLength =>
-      _fieldsListEntityNoRefLengthCache ??=
-          _fieldsListEntity.length - _fieldsListEntityRef.length;
+  int get _fieldsListEntityNoRefLength => _fieldsListEntityNoRefLengthCache ??=
+      _fieldsListEntity.length - _fieldsListEntityRef.length;
 
   Map<String, EntityRepository<Object>>? _fieldsEntityRepositories;
 
   Map<String, EntityRepository<Object>> _fieldsEntityRepositoriesAll() =>
-      _fieldsEntityRepositories ??=
-          _fieldsEntity.entries
-              .map((e) {
-                var repo = _resolveEntityRepository(e.value);
-                return repo != null ? MapEntry(e.key, repo) : null;
-              })
-              .nonNulls
-              .toMapFromEntries();
+      _fieldsEntityRepositories ??= _fieldsEntity.entries
+          .map((e) {
+            var repo = _resolveEntityRepository(e.value);
+            return repo != null ? MapEntry(e.key, repo) : null;
+          })
+          .nonNulls
+          .toMapFromEntries();
 
   Map<String, EntityRepository<Object>> _resolveFieldsEntityRepositories(
     EntityResolutionRulesResolved resolutionRulesResolved,
@@ -2397,8 +2392,10 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
           return resolveRelationshipEntities(relationshipsEntities);
         }
 
-        var allTargetIds =
-            relationships.values.expand((e) => e).toSet().toList();
+        var allTargetIds = relationships.values
+            .expand((e) => e)
+            .toSet()
+            .toList();
 
         // ignore: discarded_futures
         var targetsAsync = targetEntityRepository.selectByIDs(
@@ -2416,11 +2413,15 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
           );
 
           var relationshipsEntities = relationships.map((id, targetIds) {
-            var targetEntities =
-                targetIds.map((id) => allTargetsById[id]).nonNulls.toList();
+            var targetEntities = targetIds
+                .map((id) => allTargetsById[id])
+                .nonNulls
+                .toList();
 
-            var targetEntitiesCast =
-                targetEntityHandler.castList(targetEntities, targetType)!;
+            var targetEntitiesCast = targetEntityHandler.castList(
+              targetEntities,
+              targetType,
+            )!;
 
             return MapEntry(id, targetEntitiesCast);
           });
@@ -2498,24 +2499,24 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
   ) {
     var databaseAdapter = repositoryAdapter.databaseAdapter;
 
-    var entries =
-        fieldsListEntity.entries.map((e) {
-          var fieldName = e.key;
-          var targetType = e.value.arguments0!.type;
+    var entries = fieldsListEntity.entries.map((e) {
+      var fieldName = e.key;
+      var targetType = e.value.arguments0!.type;
 
-          var targetRepositoryAdapter = databaseAdapter
-              .getRepositoryAdapterByType(targetType);
-          if (targetRepositoryAdapter == null) return null;
+      var targetRepositoryAdapter = databaseAdapter.getRepositoryAdapterByType(
+        targetType,
+      );
+      if (targetRepositoryAdapter == null) return null;
 
-          var relationship = tableScheme.getTableRelationshipReference(
-            sourceTable: tableName,
-            sourceField: fieldName,
-            targetTable: targetRepositoryAdapter.name,
-          );
-          if (relationship == null) return null;
+      var relationship = tableScheme.getTableRelationshipReference(
+        sourceTable: tableName,
+        sourceField: fieldName,
+        targetTable: targetRepositoryAdapter.name,
+      );
+      if (relationship == null) return null;
 
-          return MapEntry(e.key, relationship);
-        }).nonNulls;
+      return MapEntry(e.key, relationship);
+    }).nonNulls;
 
     var relationshipFields =
         Map<String, TableRelationshipReference>.fromEntries(entries);
@@ -2704,11 +2705,10 @@ class DBEntityRepository<O extends Object> extends EntityRepository<O>
     checkNotClosed();
 
     return Transaction.executeBlock((transaction) {
-      var result =
-          os
-              .map((o) => store(o, transaction: transaction))
-              .toList(growable: false)
-              .resolveAll();
+      var result = os
+          .map((o) => store(o, transaction: transaction))
+          .toList(growable: false)
+          .resolveAll();
 
       return result;
     }, transaction: transaction);
@@ -2844,8 +2844,9 @@ abstract class DBEntityRepositoryProvider<A extends DBAdapter>
   ) {
     var repositoriesByType = repositories.groupBy((r) => (r.type, r.name));
 
-    var duplicatedRepositoriesGroups =
-        repositoriesByType.entries.where((e) => e.value.length > 1).toList();
+    var duplicatedRepositoriesGroups = repositoriesByType.entries
+        .where((e) => e.value.length > 1)
+        .toList();
 
     if (duplicatedRepositoriesGroups.isEmpty) return null;
 
diff --git a/lib/src/bones_api_entity_db_memory.dart b/lib/src/bones_api_entity_db_memory.dart
index b7b462cb..0eab9703 100644
--- a/lib/src/bones_api_entity_db_memory.dart
+++ b/lib/src/bones_api_entity_db_memory.dart
@@ -130,10 +130,8 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
   }) {
     boot();
 
-    var (
-      generateTables: generateTables,
-      checkTables: checkTables,
-    ) = DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
+    var (generateTables: generateTables, checkTables: checkTables) =
+        DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
 
     var populate = config?['populate'];
     Object? populateTables;
@@ -316,10 +314,9 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
 
         var tableMap = _getTableMap(ref.sourceTable, false);
 
-        var reference =
-            tableMap?.entries
-                .where((e) => e.value[sourceField] == id)
-                .firstOrNull;
+        var reference = tableMap?.entries
+            .where((e) => e.value[sourceField] == id)
+            .firstOrNull;
 
         if (reference != null) {
           var value = reference.value[sourceField];
@@ -396,10 +393,9 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
       o,
     );
 
-    var uniques =
-        fieldsEntityAnnotations?.entries
-            .where((e) => e.value.hasUnique)
-            .toList();
+    var uniques = fieldsEntityAnnotations?.entries
+        .where((e) => e.value.hasUnique)
+        .toList();
     if (uniques == null || uniques.isEmpty) return;
 
     for (var e in uniques) {
@@ -541,8 +537,8 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
       );
 
   Map<String, MapHistory<Object, Set<Object>>> _getTableIndexes(String table) {
-    var tableIndexes =
-        _tablesIndexes[table] ??= <String, MapHistory<Object, Set<Object>>>{};
+    var tableIndexes = _tablesIndexes[table] ??=
+        <String, MapHistory<Object, Set<Object>>>{};
 
     return tableIndexes;
   }
@@ -697,15 +693,13 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (!fieldType.isPrimitiveType &&
             EntityHandler.isValidEntityType(fieldType.type)) {
           var fieldEntityRepository = getEntityRepositoryByTypeInfo(fieldType);
@@ -879,15 +873,14 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
 
     // The `ORDER BY` must be applied before the `OFFSET`/`LIMIT`,
     // which is what makes an offset-based pagination stable:
-    var sel =
-        applySelectOrderAndPagination(
-          itr,
-          (e) => e[tableScheme?.idFieldName ?? 'id'],
-          limit: sql.limit,
-          offset: sql.offset,
-          orderByID: sql.orderByID,
-          orderDirection: sql.orderDirection,
-        ).toList();
+    var sel = applySelectOrderAndPagination(
+      itr,
+      (e) => e[tableScheme?.idFieldName ?? 'id'],
+      limit: sql.limit,
+      offset: sql.offset,
+      orderByID: sql.orderByID,
+      orderDirection: sql.orderDirection,
+    ).toList();
 
     return sel;
   }
@@ -942,14 +935,13 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
     var entityHandler = getEntityHandler(tableName: table);
 
     if (tableScheme == null || tableScheme.fieldsReferencedTablesLength == 0) {
-      var entries =
-          map.entries.where((e) {
-            return sql.condition!.matchesEntityMap(
-              e.value,
-              namedParameters: sql.parametersByPlaceholder,
-              entityHandler: entityHandler,
-            );
-          }).toList();
+      var entries = map.entries.where((e) {
+        return sql.condition!.matchesEntityMap(
+          e.value,
+          namedParameters: sql.parametersByPlaceholder,
+          entityHandler: entityHandler,
+        );
+      }).toList();
 
       _checkNotReferencedEntities(entries, table, sql);
 
@@ -1051,11 +1043,10 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
       }),
     );
 
-    var relationshipsTables =
-        tableScheme.tableRelationshipReference.values
-            .expand((e) => e)
-            .where((e) => e.sourceTable == tableScheme.name)
-            .toList();
+    var relationshipsTables = tableScheme.tableRelationshipReference.values
+        .expand((e) => e)
+        .where((e) => e.sourceTable == tableScheme.name)
+        .toList();
 
     if (relationshipsTables.isNotEmpty) {
       if (entityHandler == null) {
@@ -1067,8 +1058,8 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
       var fieldId = entityHandler.idFieldName();
       var id = obj2[fieldId];
 
-      var fieldsListEntity =
-          entityHandler.fieldsWithTypeListEntityOrReference();
+      var fieldsListEntity = entityHandler
+          .fieldsWithTypeListEntityOrReference();
 
       for (var e in fieldsListEntity.entries) {
         var fieldKey = e.key;
@@ -1164,33 +1155,32 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
       return [];
     }
 
-    var targetIds =
-        relWithID
-            .map((relId) => relMap[relId]?[targetRelationshipField])
-            .nonNulls
-            .toList();
+    var targetIds = relWithID
+        .map((relId) => relMap[relId]?[targetRelationshipField])
+        .nonNulls
+        .toList();
 
     if (targetIds.isEmpty) {
       return [];
     }
 
-    var targetObjs =
-        targetIds.map((tId) => _getByID(targetTable, tId) ?? tId).toList();
+    var targetObjs = targetIds
+        .map((tId) => _getByID(targetTable, tId) ?? tId)
+        .toList();
 
     var tableScheme2 = getTableScheme(targetTable);
 
     if (tableScheme2 != null && tableScheme2.hasTableReferences) {
       var entityHandler2 = getEntityHandler(tableName: tableScheme2.name);
 
-      targetObjs =
-          targetObjs
-              .map((e) {
-                return e is! Map<String, Object?>
-                    ? null
-                    : _resolveEntityMap(e, entityHandler2, tableScheme2);
-              })
-              .nonNulls
-              .toList();
+      targetObjs = targetObjs
+          .map((e) {
+            return e is! Map<String, Object?>
+                ? null
+                : _resolveEntityMap(e, entityHandler2, tableScheme2);
+          })
+          .nonNulls
+          .toList();
     }
 
     return targetObjs;
@@ -1338,10 +1328,9 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
       if (targetEntityHandler != null) {
         targetName = getEntityRepositoryByType(targetEntityHandler.type)?.name;
         targetIdField = targetEntityHandler.idFieldName();
-        targetIdType =
-            targetEntityHandler
-                .getFieldType(null, targetIdField, resolveFiledName: false)
-                ?.type;
+        targetIdType = targetEntityHandler
+            .getFieldType(null, targetIdField, resolveFiledName: false)
+            ?.type;
       }
 
       targetName ??= targetEntityType.type.toString().toLowerCase();
@@ -1368,8 +1357,8 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
 
     var entityType =
         fieldType.isListEntityOrReference || fieldType.isEntityReferenceType
-            ? fieldType.arguments0
-            : fieldType;
+        ? fieldType.arguments0
+        : fieldType;
 
     if (entityType == null ||
         !EntityHandler.isValidEntityType(entityType.type)) {
@@ -1408,44 +1397,43 @@ class DBSQLMemoryAdapter extends DBSQLAdapter<DBSQLMemoryAdapterContext>
 
     allTablesReferences.removeWhere((repo, refs) => refs.isEmpty);
 
-    var relationships =
-        allTablesReferences.entries.expand((e) {
-          var repo = e.key;
-          var refs = e.value;
-
-          return refs.values.map((ref) {
-            var sourceTable = ref.sourceTable;
-            var sourceField = ref.sourceField;
-
-            var targetTable = ref.targetTable;
-            var targetField = ref.targetField;
-
-            var sourceEntityHandler = repo.entityHandler;
-            var sourceFieldId = sourceEntityHandler.idFieldName();
-            var sourceFieldIdType =
-                sourceEntityHandler
-                    .getFieldType(null, sourceFieldId, resolveFiledName: false)
-                    ?.type ??
-                int;
-
-            var relTable = '${sourceTable}__${sourceField}__rel';
-            var relSourceField = '${sourceTable}__$sourceFieldId';
-            var relTargetField = '${targetTable}__$targetField';
-
-            return TableRelationshipReference(
-              relTable,
-              sourceTable,
-              sourceFieldId,
-              sourceFieldIdType,
-              relSourceField,
-              targetTable,
-              ref.targetField,
-              ref.targetFieldType,
-              relTargetField,
-              relationshipField: sourceField,
-            );
-          });
-        }).toList();
+    var relationships = allTablesReferences.entries.expand((e) {
+      var repo = e.key;
+      var refs = e.value;
+
+      return refs.values.map((ref) {
+        var sourceTable = ref.sourceTable;
+        var sourceField = ref.sourceField;
+
+        var targetTable = ref.targetTable;
+        var targetField = ref.targetField;
+
+        var sourceEntityHandler = repo.entityHandler;
+        var sourceFieldId = sourceEntityHandler.idFieldName();
+        var sourceFieldIdType =
+            sourceEntityHandler
+                .getFieldType(null, sourceFieldId, resolveFiledName: false)
+                ?.type ??
+            int;
+
+        var relTable = '${sourceTable}__${sourceField}__rel';
+        var relSourceField = '${sourceTable}__$sourceFieldId';
+        var relTargetField = '${targetTable}__$targetField';
+
+        return TableRelationshipReference(
+          relTable,
+          sourceTable,
+          sourceFieldId,
+          sourceFieldIdType,
+          relSourceField,
+          targetTable,
+          ref.targetField,
+          ref.targetFieldType,
+          relTargetField,
+          relationshipField: sourceField,
+        );
+      });
+    }).toList();
 
     return relationships;
   }
diff --git a/lib/src/bones_api_entity_db_mysql.dart b/lib/src/bones_api_entity_db_mysql.dart
index f08b113f..b8b65db0 100644
--- a/lib/src/bones_api_entity_db_mysql.dart
+++ b/lib/src/bones_api_entity_db_mysql.dart
@@ -92,10 +92,9 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
     super.logSQL,
   }) : host = host ?? 'localhost',
        port = port ?? 3306,
-       _password =
-           (password != null && password is! PasswordProvider
-               ? password.toString()
-               : null),
+       _password = (password != null && password is! PasswordProvider
+           ? password.toString()
+           : null),
        _passwordProvider =
            passwordProvider ?? (password is PasswordProvider ? password : null),
        super(
@@ -164,10 +163,8 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
     minConnections ??= 1;
     maxConnections ??= 3;
 
-    var (
-      generateTables: generateTables,
-      checkTables: checkTables,
-    ) = DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
+    var (generateTables: generateTables, checkTables: checkTables) =
+        DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
 
     var populate = config?['populate'];
     Object? populateTables;
@@ -428,8 +425,9 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
   ) {
     var primaryFields = scheme.where((f) => f['Key'] == 'PRI');
 
-    var primaryFieldsNames =
-        primaryFields.map((e) => e['Field'].toString()).toList();
+    var primaryFieldsNames = primaryFields
+        .map((e) => e['Field'].toString())
+        .toList();
 
     return selectIDFieldName(table, primaryFieldsNames);
   }
@@ -507,45 +505,43 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
       tablesReferences.add(refs);
     }
 
-    tablesReferences =
-        tablesReferences.where((m) {
-          return m.length > 1 &&
-              m.values.where((r) => r.targetTable == table).isNotEmpty &&
-              m.values.where((r) => r.targetTable != table).isNotEmpty;
-        }).toList();
-
-    var relationships =
-        tablesReferences
-            .map((e) {
-              var refToTables = e.values
-                  .where((r) => r.targetTable == table)
-                  .toList(growable: false);
-
-              var otherRefs = e.values
-                  .where((r) => r.targetTable != table)
-                  .toList(growable: false);
-
-              if (refToTables.length != 1 || otherRefs.length != 1) {
-                return null;
-              }
-
-              var refToTable = refToTables.first;
-              var otherRef = otherRefs.first;
-
-              return TableRelationshipReference(
-                refToTable.sourceTable,
-                refToTable.targetTable,
-                refToTable.targetField,
-                refToTable.targetFieldType,
-                refToTable.sourceField,
-                otherRef.targetTable,
-                otherRef.targetField,
-                otherRef.targetFieldType,
-                otherRef.sourceField,
-              );
-            })
-            .nonNulls
-            .toList();
+    tablesReferences = tablesReferences.where((m) {
+      return m.length > 1 &&
+          m.values.where((r) => r.targetTable == table).isNotEmpty &&
+          m.values.where((r) => r.targetTable != table).isNotEmpty;
+    }).toList();
+
+    var relationships = tablesReferences
+        .map((e) {
+          var refToTables = e.values
+              .where((r) => r.targetTable == table)
+              .toList(growable: false);
+
+          var otherRefs = e.values
+              .where((r) => r.targetTable != table)
+              .toList(growable: false);
+
+          if (refToTables.length != 1 || otherRefs.length != 1) {
+            return null;
+          }
+
+          var refToTable = refToTables.first;
+          var otherRef = otherRefs.first;
+
+          return TableRelationshipReference(
+            refToTable.sourceTable,
+            refToTable.targetTable,
+            refToTable.targetField,
+            refToTable.targetFieldType,
+            refToTable.sourceField,
+            otherRef.targetTable,
+            otherRef.targetField,
+            otherRef.targetFieldType,
+            otherRef.sourceField,
+          );
+        })
+        .nonNulls
+        .toList();
 
     return relationships;
   }
@@ -589,14 +585,12 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
   }) {
     if (contextID != null) {
       var cache = _findFieldsReferencedTablesContextCache[contextID] ??= {};
-      return cache[table] ??= _findFieldsReferencedTablesImpl(
-        connection,
-        table,
-      ).then((ret) {
-        cache[table] = ret;
-        _findFieldsReferencedTablesCache[table] = ret;
-        return ret;
-      });
+      return cache[table] ??= _findFieldsReferencedTablesImpl(connection, table)
+          .then((ret) {
+            cache[table] = ret;
+            _findFieldsReferencedTablesCache[table] = ret;
+            return ret;
+          });
     }
 
     return _findFieldsReferencedTablesCache.putIfAbsentCheckedAsync(
@@ -609,7 +603,8 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
     DBMySqlConnectionWrapper connection,
     String table,
   ) async {
-    var sql = '''
+    var sql =
+        '''
     SELECT 
       CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME,
       REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
@@ -624,42 +619,41 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
 
     var referenceFields = results.map((r) => r.fields).toList(growable: false);
 
-    var mapEntriesRet =
-        referenceFields
-            .map((e) {
-              var sourceTable = e['TABLE_NAME'];
-              var sourceField = e['COLUMN_NAME'];
-              var targetTable = e['REFERENCED_TABLE_NAME'];
-              var targetField = e['REFERENCED_COLUMN_NAME'];
-              if (targetTable == null || targetField == null) return null;
-
-              var sourceFieldsTypesRet = getTableFieldsTypes(table);
-              var targetFieldsTypesRet = getTableFieldsTypes(targetTable);
-
-              return sourceFieldsTypesRet.resolveBoth(targetFieldsTypesRet, (
-                sourceFieldsTypes,
-                targetFieldsTypes,
-              ) {
-                var sourceFieldType = sourceFieldsTypes?[sourceField] ?? String;
-                var targetFieldType = targetFieldsTypes?[targetField] ?? String;
-
-                var reference = TableFieldReference(
-                  sourceTable,
-                  sourceField,
-                  sourceFieldType,
-                  targetTable,
-                  targetField,
-                  targetFieldType,
-                );
-
-                return MapEntry<String, TableFieldReference>(
-                  sourceField,
-                  reference,
-                );
-              });
-            })
-            .nonNulls
-            .resolveAll();
+    var mapEntriesRet = referenceFields
+        .map((e) {
+          var sourceTable = e['TABLE_NAME'];
+          var sourceField = e['COLUMN_NAME'];
+          var targetTable = e['REFERENCED_TABLE_NAME'];
+          var targetField = e['REFERENCED_COLUMN_NAME'];
+          if (targetTable == null || targetField == null) return null;
+
+          var sourceFieldsTypesRet = getTableFieldsTypes(table);
+          var targetFieldsTypesRet = getTableFieldsTypes(targetTable);
+
+          return sourceFieldsTypesRet.resolveBoth(targetFieldsTypesRet, (
+            sourceFieldsTypes,
+            targetFieldsTypes,
+          ) {
+            var sourceFieldType = sourceFieldsTypes?[sourceField] ?? String;
+            var targetFieldType = targetFieldsTypes?[targetField] ?? String;
+
+            var reference = TableFieldReference(
+              sourceTable,
+              sourceField,
+              sourceFieldType,
+              targetTable,
+              targetField,
+              targetFieldType,
+            );
+
+            return MapEntry<String, TableFieldReference>(
+              sourceField,
+              reference,
+            );
+          });
+        })
+        .nonNulls
+        .resolveAll();
 
     return mapEntriesRet.resolveMapped((mapEntries) {
       var map = Map<String, TableFieldReference>.fromEntries(mapEntries);
@@ -847,26 +841,20 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
   FutureOr<List<Results>> _executeSQLs(
     List<SQL> sql,
     DBMySqlConnectionWrapper connection,
-  ) =>
-      sql
-          .map(
-            (e) =>
-                connection.query(e.sqlPositional, e.parametersValuesByPosition),
-          )
-          .resolveAll();
+  ) => sql
+      .map(
+        (e) => connection.query(e.sqlPositional, e.parametersValuesByPosition),
+      )
+      .resolveAll();
 
   FutureOr<Iterable<Map<String, dynamic>>> _doDeleteSQLImpl(
     String table,
     SQL sql,
     DBMySqlConnectionWrapper connection,
   ) {
-    FutureOr<Results?> sqlRet =
-        sql.isDummy
-            ? null
-            : connection.query(
-              sql.sqlPositional,
-              sql.parametersValuesByPosition,
-            );
+    FutureOr<Results?> sqlRet = sql.isDummy
+        ? null
+        : connection.query(sql.sqlPositional, sql.parametersValuesByPosition);
 
     var posSQLs = sql.posSQL;
 
@@ -1053,14 +1041,12 @@ class DBMySQLAdapter extends DBSQLAdapter<DBMySqlConnectionWrapper>
         });
       },
       validator: (c) => !transaction.isAborted,
-      onError:
-          (e, s) => transaction.notifyExecutionError(
-            e,
-            s,
-            errorResolver: resolveError,
-            debugInfo:
-                () => transaction.toString(withExecutedOperations: false),
-          ),
+      onError: (e, s) => transaction.notifyExecutionError(
+        e,
+        s,
+        errorResolver: resolveError,
+        debugInfo: () => transaction.toString(withExecutedOperations: false),
+      ),
     );
 
     transaction.transactionResult = result;
diff --git a/lib/src/bones_api_entity_db_object_directory.dart b/lib/src/bones_api_entity_db_object_directory.dart
index daab98a4..2f7315e4 100644
--- a/lib/src/bones_api_entity_db_object_directory.dart
+++ b/lib/src/bones_api_entity_db_object_directory.dart
@@ -402,11 +402,10 @@ class DBObjectDirectoryAdapter
   }
 
   List<File> _listTableFiles(Directory tableDir) {
-    var list =
-        tableDir.listSync(recursive: false).whereType<File>().where((e) {
-          var path = e.path;
-          return path.endsWith('.json') && !path.startsWith('.');
-        }).toList();
+    var list = tableDir.listSync(recursive: false).whereType<File>().where((e) {
+      var path = e.path;
+      return path.endsWith('.json') && !path.startsWith('.');
+    }).toList();
     return list;
   }
 
@@ -443,11 +442,10 @@ class DBObjectDirectoryAdapter
     var tableDir = _resolveTableDirectory(table);
     if (!tableDir.existsSync()) return [];
 
-    var existIDs =
-        ids.where((id) {
-          var objFile = _resolveObjectFile(table, id);
-          return objFile.existsSync();
-        }).toList();
+    var existIDs = ids.where((id) {
+      var objFile = _resolveObjectFile(table, id);
+      return objFile.existsSync();
+    }).toList();
 
     return existIDs;
   }
@@ -516,8 +514,9 @@ class DBObjectDirectoryAdapter
     var tableDir = _resolveTableDirectory(table);
     if (!tableDir.existsSync()) return [];
 
-    var entries =
-        await ids.map((id) => _readObject(table, id)).resolveAllNotNull();
+    var entries = await ids
+        .map((id) => _readObject(table, id))
+        .resolveAllNotNull();
 
     return _applyOrderAndPagination(
       table,
@@ -564,12 +563,11 @@ class DBObjectDirectoryAdapter
 
     var files = _listTableFiles(tableDir);
 
-    var entries =
-        files.map((f) {
-          var fileName = pack_path.split(f.path).last;
-          var id = pack_path.withoutExtension(fileName);
-          return _readObject(table, id);
-        }).resolveAllNotNull();
+    var entries = files.map((f) {
+      var fileName = pack_path.split(f.path).last;
+      var id = pack_path.withoutExtension(fileName);
+      return _readObject(table, id);
+    }).resolveAllNotNull();
 
     return entries.resolveMapped(
       (entries) => _applyOrderAndPagination(
@@ -881,15 +879,13 @@ class DBObjectDirectoryAdapter
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (fieldType.isListEntity) {
           var listEntityType = fieldType.listEntityType!;
 
@@ -904,15 +900,13 @@ class DBObjectDirectoryAdapter
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (!fieldType.isPrimitiveType && fieldType.entityType != null) {
           var entityType = fieldType.entityType!;
           var fieldEntityRepository = getEntityRepositoryByType(entityType);
@@ -968,14 +962,13 @@ class DBObjectDirectoryAdapter
     if (isTransactionWithSingleOperation(op)) {
       return executeWithPool(
         f,
-        onError:
-            (e, s) => transaction.notifyExecutionError(
-              e,
-              s,
-              errorResolver: resolveError,
-              operation: op,
-              debugInfo: () => op.toString(),
-            ),
+        onError: (e, s) => transaction.notifyExecutionError(
+          e,
+          s,
+          errorResolver: resolveError,
+          operation: op,
+          debugInfo: () => op.toString(),
+        ),
       );
     }
 
@@ -993,9 +986,9 @@ class DBObjectDirectoryAdapter
         () => openTransaction(transaction),
         callCloseTransactionRequired
             ? () => closeTransaction(
-              transaction,
-              transaction.context as DBObjectDirectoryAdapterContext?,
-            )
+                transaction,
+                transaction.context as DBObjectDirectoryAdapterContext?,
+              )
             : null,
       );
     }
diff --git a/lib/src/bones_api_entity_db_object_gcs.dart b/lib/src/bones_api_entity_db_object_gcs.dart
index 881f2a9f..274aefa5 100644
--- a/lib/src/bones_api_entity_db_object_gcs.dart
+++ b/lib/src/bones_api_entity_db_object_gcs.dart
@@ -185,10 +185,9 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
       if (limitStr != null && limitStr.isNotEmpty) {
         limitStr = limitStr.replaceAll(RegExp(r'\s'), '').toLowerCase();
 
-        var nPart =
-            limitStr.length > 1
-                ? limitStr.substring(0, limitStr.length - 1)
-                : limitStr;
+        var nPart = limitStr.length > 1
+            ? limitStr.substring(0, limitStr.length - 1)
+            : limitStr;
 
         int unit;
         if (limitStr.endsWith('g')) {
@@ -607,8 +606,9 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
     bool? orderByID,
     OrderDirection? orderDirection,
   }) async {
-    var entries =
-        await ids.map((id) => _readObject(table, id)).resolveAllNotNull();
+    var entries = await ids
+        .map((id) => _readObject(table, id))
+        .resolveAllNotNull();
 
     return _applyOrderAndPagination(
       table,
@@ -652,12 +652,11 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
   }) async {
     var files = await _listTableFiles(table);
 
-    var entries =
-        await files.map((f) {
-          var fileName = f.split('/').last;
-          var id = pack_path.withoutExtension(fileName);
-          return _readObject(table, id);
-        }).resolveAllNotNull();
+    var entries = await files.map((f) {
+      var fileName = f.split('/').last;
+      var id = pack_path.withoutExtension(fileName);
+      return _readObject(table, id);
+    }).resolveAllNotNull();
 
     return _applyOrderAndPagination(
       table,
@@ -1047,16 +1046,17 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
     _checkCacheDirectoryLimitLastTime = checkInitTime;
     _checkCacheDirectoryLimitSkips = 0;
 
-    var files =
-        list.whereType<File>().where((f) => f.path.endsWith(".json")).toList();
+    var files = list
+        .whereType<File>()
+        .where((f) => f.path.endsWith(".json"))
+        .toList();
 
     var totalFiles = files.length;
 
-    var filesStats =
-        await files
-            .map((f) => MapEntry(f, f.statLimited()))
-            .toMapFromEntries()
-            .resolveAllValues();
+    var filesStats = await files
+        .map((f) => MapEntry(f, f.statLimited()))
+        .toMapFromEntries()
+        .resolveAllValues();
 
     var totalSize = filesStats.values.map((s) => s.size).sum;
 
@@ -1082,19 +1082,17 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
     var entries = filesStats.entries.toList();
     entries.sort((a, b) => a.value.modified.compareTo(b.value.modified));
 
-    final delNeededFiles =
-        cacheFilesLimit <= 0
-            ? 0
-            :
-            // Del extra files + 20%:
-            (totalFiles - (cacheFilesLimit * 0.80)).toInt();
+    final delNeededFiles = cacheFilesLimit <= 0
+        ? 0
+        :
+          // Del extra files + 20%:
+          (totalFiles - (cacheFilesLimit * 0.80)).toInt();
 
-    final delNeededSize =
-        cacheLimit <= 0
-            ? 0
-            :
-            // Del extra bytes + 20%:
-            (totalSize - (cacheLimit * 0.80)).toInt();
+    final delNeededSize = cacheLimit <= 0
+        ? 0
+        :
+          // Del extra bytes + 20%:
+          (totalSize - (cacheLimit * 0.80)).toInt();
 
     var releaseInfo = [
       if (delNeededFiles > 0) '$delNeededFiles files',
@@ -1124,8 +1122,10 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
 
     final removeInitTime = DateTime.now();
 
-    var delResults =
-        await del.map((f) => f.deleteLimited()).toList().resolveAll();
+    var delResults = await del
+        .map((f) => f.deleteLimited())
+        .toList()
+        .resolveAll();
 
     final removeTime = DateTime.now().difference(removeInitTime);
 
@@ -1298,15 +1298,13 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (fieldType.isListEntity) {
           var listEntityType = fieldType.listEntityType!;
 
@@ -1321,15 +1319,13 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (!fieldType.isPrimitiveType && fieldType.entityType != null) {
           var entityType = fieldType.entityType!;
           var fieldEntityRepository = getEntityRepositoryByType(entityType);
@@ -1385,14 +1381,13 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
     if (isTransactionWithSingleOperation(op)) {
       return executeWithPool(
         f,
-        onError:
-            (e, s) => transaction.notifyExecutionError(
-              e,
-              s,
-              errorResolver: resolveError,
-              operation: op,
-              debugInfo: () => op.toString(),
-            ),
+        onError: (e, s) => transaction.notifyExecutionError(
+          e,
+          s,
+          errorResolver: resolveError,
+          operation: op,
+          debugInfo: () => op.toString(),
+        ),
       );
     }
 
@@ -1410,9 +1405,9 @@ class DBObjectGCSAdapter extends DBObjectAdapter<DBObjectGCSAdapterContext> {
         () => openTransaction(transaction),
         callCloseTransactionRequired
             ? () => closeTransaction(
-              transaction,
-              transaction.context as DBObjectGCSAdapterContext?,
-            )
+                transaction,
+                transaction.context as DBObjectGCSAdapterContext?,
+              )
             : null,
       );
     }
diff --git a/lib/src/bones_api_entity_db_object_memory.dart b/lib/src/bones_api_entity_db_object_memory.dart
index 0aaf2386..65655c75 100644
--- a/lib/src/bones_api_entity_db_object_memory.dart
+++ b/lib/src/bones_api_entity_db_object_memory.dart
@@ -564,19 +564,18 @@ class DBObjectMemoryAdapter
     var map = _getTableMap(table, false);
     if (map == null) return [];
 
-    var entries =
-        ids
-            .map((id) {
-              var entry = map[id];
+    var entries = ids
+        .map((id) {
+          var entry = map[id];
 
-              if (entry == null) {
-                return null;
-              }
+          if (entry == null) {
+            return null;
+          }
 
-              return entry;
-            })
-            .nonNulls
-            .toList();
+          return entry;
+        })
+        .nonNulls
+        .toList();
 
     return _applyOrderAndPagination(
       table,
@@ -859,15 +858,13 @@ class DBObjectMemoryAdapter
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (fieldType.isListEntity) {
           var listEntityType = fieldType.listEntityType!;
 
@@ -882,15 +879,13 @@ class DBObjectMemoryAdapter
 
           var valIter = value is Iterable ? value : [value];
 
-          value =
-              valIter
-                  .map(
-                    (v) =>
-                        fieldListEntityRepository.isOfEntityType(v)
-                            ? fieldListEntityRepository.getEntityID(v)
-                            : v,
-                  )
-                  .toList();
+          value = valIter
+              .map(
+                (v) => fieldListEntityRepository.isOfEntityType(v)
+                    ? fieldListEntityRepository.getEntityID(v)
+                    : v,
+              )
+              .toList();
         } else if (!fieldType.isPrimitiveType && fieldType.entityType != null) {
           var entityType = fieldType.entityType!;
           var fieldEntityRepository = getEntityRepositoryByType(entityType);
@@ -946,14 +941,13 @@ class DBObjectMemoryAdapter
     if (isTransactionWithSingleOperation(op)) {
       return executeWithPool(
         f,
-        onError:
-            (e, s) => transaction.notifyExecutionError(
-              e,
-              s,
-              errorResolver: resolveError,
-              operation: op,
-              debugInfo: () => op.toString(),
-            ),
+        onError: (e, s) => transaction.notifyExecutionError(
+          e,
+          s,
+          errorResolver: resolveError,
+          operation: op,
+          debugInfo: () => op.toString(),
+        ),
       );
     }
 
@@ -971,9 +965,9 @@ class DBObjectMemoryAdapter
         () => openTransaction(transaction),
         callCloseTransactionRequired
             ? () => closeTransaction(
-              transaction,
-              transaction.context as DBObjectMemoryAdapterContext?,
-            )
+                transaction,
+                transaction.context as DBObjectMemoryAdapterContext?,
+              )
             : null,
       );
     }
diff --git a/lib/src/bones_api_entity_db_postgres.dart b/lib/src/bones_api_entity_db_postgres.dart
index 3bc1630c..5589e853 100644
--- a/lib/src/bones_api_entity_db_postgres.dart
+++ b/lib/src/bones_api_entity_db_postgres.dart
@@ -100,10 +100,9 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
     super.logSQL,
   }) : host = host ?? 'localhost',
        port = port ?? 5432,
-       _password =
-           (password != null && password is! PasswordProvider
-               ? password.toString()
-               : null),
+       _password = (password != null && password is! PasswordProvider
+           ? password.toString()
+           : null),
        _passwordProvider =
            passwordProvider ?? (password is PasswordProvider ? password : null),
        super(
@@ -170,10 +169,8 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
     minConnections ??= 1;
     maxConnections ??= 3;
 
-    var (
-      generateTables: generateTables,
-      checkTables: checkTables,
-    ) = DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
+    var (generateTables: generateTables, checkTables: checkTables) =
+        DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
 
     var populate = config?['populate'];
     Object? populateTables;
@@ -385,10 +382,9 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
     } else if (connectivity == DBAdapterConnectivity.insecure) {
       (connection, secure) = await _connectNoSSLImpl(endpoint, timeout);
     } else {
-      (connection, secure) =
-          await (_lastConnectSSLSupported
-              ? _connectSSLImpl(endpoint, timeout)
-              : _connectNoSSLImpl(endpoint, timeout));
+      (connection, secure) = await (_lastConnectSSLSupported
+          ? _connectSSLImpl(endpoint, timeout)
+          : _connectNoSSLImpl(endpoint, timeout));
     }
 
     if (connection == null) return null;
@@ -640,7 +636,8 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
     String table,
     Map<String, Type> fieldsTypes,
   ) async {
-    var sql = '''
+    var sql =
+        '''
     SELECT 
       pg_get_constraintdef(con.oid) AS constraint_definition
     FROM pg_constraint con
@@ -651,33 +648,34 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
 
     var columns = await connection.mappedResultsQuery(sql);
 
-    var constraintsDefinitions =
-        columns.map((m) => m['constraint_definition'].toString()).toList();
+    var constraintsDefinitions = columns
+        .map((m) => m['constraint_definition'].toString())
+        .toList();
 
-    var constraints =
-        constraintsDefinitions.map(_parseConstraint).nonNulls.toSet();
+    var constraints = constraintsDefinitions
+        .map(_parseConstraint)
+        .nonNulls
+        .toSet();
 
     return constraints;
   }
 
   TableConstraint? _parseConstraint(String definition) {
     if (definition.startsWith("PRIMARY KEY")) {
-      var field =
-          RegExp(r'\(([^()]+?)\)')
-              .firstMatch(definition)
-              ?.group(1)
-              ?.replaceAll("'", '')
-              .replaceAll('"', '')
-              .trim();
+      var field = RegExp(r'\(([^()]+?)\)')
+          .firstMatch(definition)
+          ?.group(1)
+          ?.replaceAll("'", '')
+          .replaceAll('"', '')
+          .trim();
       return field == null ? null : TablePrimaryKeyConstraint(field);
     } else if (definition.startsWith("UNIQUE")) {
-      var field =
-          RegExp(r'\(([^()]+?)\)')
-              .firstMatch(definition)
-              ?.group(1)
-              ?.replaceAll("'", '')
-              .replaceAll('"', '')
-              .trim();
+      var field = RegExp(r'\(([^()]+?)\)')
+          .firstMatch(definition)
+          ?.group(1)
+          ?.replaceAll("'", '')
+          .replaceAll('"', '')
+          .trim();
       return field == null ? null : TableUniqueConstraint(field);
     } else if (definition.startsWith("CHECK")) {
       var idx1 = definition.indexOf('(');
@@ -685,13 +683,9 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
 
       var s = definition.substring(idx1 + 1, idx2);
 
-      var field =
-          RegExp(r'\(([^()]+?)\)')
-              .firstMatch(s)
-              ?.group(1)
-              ?.replaceAll("'", '')
-              .replaceAll('"', '')
-              .trim();
+      var field = RegExp(
+        r'\(([^()]+?)\)',
+      ).firstMatch(s)?.group(1)?.replaceAll("'", '').replaceAll('"', '').trim();
 
       if (field == null || field.isEmpty) return null;
 
@@ -700,13 +694,13 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
       Set<String>? values;
 
       if (arrayDef != null && arrayDef.isNotEmpty) {
-        values =
-            RegExp(
-              r"'(.*?)'",
-            ).allMatches(arrayDef).map((m) => m.group(1)).nonNulls.toSet();
+        values = RegExp(
+          r"'(.*?)'",
+        ).allMatches(arrayDef).map((m) => m.group(1)).nonNulls.toSet();
       } else {
-        var singleValue =
-            RegExp(r"\s+=\s+'(.*?)'").firstMatch(s)?.group(1)?.trim();
+        var singleValue = RegExp(
+          r"\s+=\s+'(.*?)'",
+        ).firstMatch(s)?.group(1)?.trim();
 
         if (singleValue != null) {
           values = {singleValue};
@@ -726,7 +720,8 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
     String table,
     List<Map<String, dynamic>> scheme,
   ) async {
-    var sql = '''
+    var sql =
+        '''
     SELECT
       c.column_name, c.data_type
     FROM
@@ -821,41 +816,40 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
       contextID: contextID,
     );
 
-    var relationships =
-        tablesReferences
-            .map((e) {
-              var refToTables = e.values
-                  .where((r) => r.targetTable == table)
-                  .toList(growable: false);
-              var otherRefs = e.values
-                  .where((r) => r.targetTable != table)
-                  .toList(growable: false);
-
-              if (refToTables.length != 1 || otherRefs.length != 1) {
-                return null;
-              }
+    var relationships = tablesReferences
+        .map((e) {
+          var refToTables = e.values
+              .where((r) => r.targetTable == table)
+              .toList(growable: false);
+          var otherRefs = e.values
+              .where((r) => r.targetTable != table)
+              .toList(growable: false);
+
+          if (refToTables.length != 1 || otherRefs.length != 1) {
+            return null;
+          }
 
-              var refToTable = refToTables.single;
-              var otherRef = otherRefs.single;
-
-              var tableRelationshipReference = TableRelationshipReference(
-                refToTable.sourceTable,
-                refToTable.targetTable,
-                refToTable.targetField,
-                refToTable.targetFieldType,
-                refToTable.sourceField,
-                otherRef.targetTable,
-                otherRef.targetField,
-                otherRef.targetFieldType,
-                otherRef.sourceField,
-                sourceRelationshipFieldIndex: refToTable.indexName,
-                targetRelationshipFieldIndex: otherRef.indexName,
-              );
+          var refToTable = refToTables.single;
+          var otherRef = otherRefs.single;
+
+          var tableRelationshipReference = TableRelationshipReference(
+            refToTable.sourceTable,
+            refToTable.targetTable,
+            refToTable.targetField,
+            refToTable.targetFieldType,
+            refToTable.sourceField,
+            otherRef.targetTable,
+            otherRef.targetField,
+            otherRef.targetFieldType,
+            otherRef.sourceField,
+            sourceRelationshipFieldIndex: refToTable.indexName,
+            targetRelationshipFieldIndex: otherRef.indexName,
+          );
 
-              return tableRelationshipReference;
-            })
-            .nonNulls
-            .toList();
+          return tableRelationshipReference;
+        })
+        .nonNulls
+        .toList();
 
     return relationships;
   }
@@ -879,12 +873,11 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
       tablesReferences.add(refs);
     }
 
-    tablesReferences =
-        tablesReferences.where((m) {
-          return m.length > 1 &&
-              m.values.where((r) => r.targetTable == table).isNotEmpty &&
-              m.values.where((r) => r.targetTable != table).isNotEmpty;
-        }).toList();
+    tablesReferences = tablesReferences.where((m) {
+      return m.length > 1 &&
+          m.values.where((r) => r.targetTable == table).isNotEmpty &&
+          m.values.where((r) => r.targetTable != table).isNotEmpty;
+    }).toList();
     return tablesReferences;
   }
 
@@ -927,14 +920,12 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
   }) {
     if (contextID != null) {
       var cache = _findFieldsReferencedTablesContextCache[contextID] ??= {};
-      return cache[table] ??= _findFieldsReferencedTablesImpl(
-        connection,
-        table,
-      ).then((ret) {
-        cache[table] = ret;
-        _findFieldsReferencedTablesCache[table] = ret;
-        return ret;
-      });
+      return cache[table] ??= _findFieldsReferencedTablesImpl(connection, table)
+          .then((ret) {
+            cache[table] = ret;
+            _findFieldsReferencedTablesCache[table] = ret;
+            return ret;
+          });
     }
 
     return _findFieldsReferencedTablesCache.putIfAbsentCheckedAsync(
@@ -947,7 +938,8 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
     PostgreSQLConnectionWrapper connection,
     String table,
   ) async {
-    var sql = '''
+    var sql =
+        '''
     SELECT
       o.conname AS constraint_name,
       
@@ -1031,15 +1023,13 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
           fkIndexName = null;
         }
 
-        var sourceFieldType =
-            sourceFieldDataType != null
-                ? _toFieldType(sourceFieldDataType)
-                : String;
+        var sourceFieldType = sourceFieldDataType != null
+            ? _toFieldType(sourceFieldDataType)
+            : String;
 
-        var targetFieldType =
-            targetFieldDataType != null
-                ? _toFieldType(targetFieldDataType)
-                : String;
+        var targetFieldType = targetFieldDataType != null
+            ? _toFieldType(targetFieldDataType)
+            : String;
 
         var reference = TableFieldReference(
           sourceTable,
@@ -1162,16 +1152,15 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
           substitutionValues: sql.parametersByPlaceholder,
         )
         .resolveMapped((results) {
-          var count =
-              results
-                  .map((row) {
-                    var count = row['count'] ?? 0;
-                    return count is int
-                        ? count
-                        : int.tryParse(count.toString().trim());
-                  })
-                  .whereType<int>()
-                  .first;
+          var count = results
+              .map((row) {
+                var count = row['count'] ?? 0;
+                return count is int
+                    ? count
+                    : int.tryParse(count.toString().trim());
+              })
+              .whereType<int>()
+              .first;
           return count;
         });
   }
@@ -1414,14 +1403,12 @@ class DBPostgreSQLAdapter extends DBSQLAdapter<PostgreSQLConnectionWrapper>
         });
       },
       validator: (c) => !transaction.isAborted,
-      onError:
-          (e, s) => transaction.notifyExecutionError(
-            e,
-            s,
-            errorResolver: resolveError,
-            debugInfo:
-                () => transaction.toString(withExecutedOperations: false),
-          ),
+      onError: (e, s) => transaction.notifyExecutionError(
+        e,
+        s,
+        errorResolver: resolveError,
+        debugInfo: () => transaction.toString(withExecutedOperations: false),
+      ),
     );
 
     transaction.transactionResult = result;
diff --git a/lib/src/bones_api_entity_db_relational.dart b/lib/src/bones_api_entity_db_relational.dart
index aa4f6347..e47419c3 100644
--- a/lib/src/bones_api_entity_db_relational.dart
+++ b/lib/src/bones_api_entity_db_relational.dart
@@ -384,21 +384,19 @@ class DBRelationalEntityRepository<O extends Object>
   Map<String, TypeInfo>? _nonPrimitiveFields;
 
   Map<String, TypeInfo> _getNonPrimitiveFields(O o) =>
-      _nonPrimitiveFields ??=
-          entityHandler
-              .fieldsNames(o)
-              .map((fieldName) {
-                var fieldType =
-                    entityHandler.getFieldType(
-                      o,
-                      fieldName,
-                      resolveFiledName: false,
-                    )!;
-                if (fieldType.isPrimitiveType) return null;
-                return MapEntry(fieldName, fieldType);
-              })
-              .nonNulls
-              .toMapFromEntries();
+      _nonPrimitiveFields ??= entityHandler
+          .fieldsNames(o)
+          .map((fieldName) {
+            var fieldType = entityHandler.getFieldType(
+              o,
+              fieldName,
+              resolveFiledName: false,
+            )!;
+            if (fieldType.isPrimitiveType) return null;
+            return MapEntry(fieldName, fieldType);
+          })
+          .nonNulls
+          .toMapFromEntries();
 
   @override
   FutureOr<bool> ensureReferencesStored(
@@ -441,15 +439,14 @@ class DBRelationalEntityRepository<O extends Object>
             );
             if (elementRepository == null) return null;
 
-            var futures =
-                value.map((e) {
-                  if (!elementRepository.isOfEntityType(e)) return e;
-                  return elementRepository.ensureStored(
-                    e,
-                    transaction: transaction,
-                    operation: operation,
-                  );
-                }).toList();
+            var futures = value.map((e) {
+              if (!elementRepository.isOfEntityType(e)) return e;
+              return elementRepository.ensureStored(
+                e,
+                transaction: transaction,
+                operation: operation,
+              );
+            }).toList();
 
             return futures.resolveAll().resolveMapped((ids) {
               if (fieldValue is EntityReferenceList) {
@@ -785,26 +782,25 @@ class DBRelationalEntityRepository<O extends Object>
       );
     }
 
-    var ret =
-        fieldsListEntity.entries.map((e) {
-          var field = e.key;
-          var fieldType = e.value;
-          var values = entityHandler.getField(o, field);
-          if (values is EntityReferenceList) {
-            values = values.entitiesOrIDs;
-          }
+    var ret = fieldsListEntity.entries.map((e) {
+      var field = e.key;
+      var fieldType = e.value;
+      var values = entityHandler.getField(o, field);
+      if (values is EntityReferenceList) {
+        values = values.entitiesOrIDs;
+      }
 
-          var list = values is Iterable ? values.asList : [values];
-          var listNotNull = list.nonNulls.toList();
+      var list = values is Iterable ? values.asList : [values];
+      var listNotNull = list.nonNulls.toList();
 
-          return setRelationship(
-            o,
-            field,
-            listNotNull as dynamic,
-            fieldType: fieldType,
-            transaction: transaction,
-          );
-        }).resolveAll();
+      return setRelationship(
+        o,
+        field,
+        listNotNull as dynamic,
+        fieldType: fieldType,
+        transaction: transaction,
+      );
+    }).resolveAll();
 
     return ret.resolveWithValue(true);
   }
@@ -833,15 +829,13 @@ class DBRelationalEntityRepository<O extends Object>
 
     var oId = entityHandler.getID(o);
 
-    var othersIds =
-        values
-            .map(
-              (e) =>
-                  valuesEntityHandler.isEntityInstance(e)
-                      ? valuesEntityHandler.getID(e)
-                      : e,
-            )
-            .toList();
+    var othersIds = values
+        .map(
+          (e) => valuesEntityHandler.isEntityInstance(e)
+              ? valuesEntityHandler.getID(e)
+              : e,
+        )
+        .toList();
 
     try {
       return repositoryAdapter.doInsertRelationship(
@@ -932,10 +926,9 @@ class DBRelationalEntityRepository<O extends Object>
 
       if (fieldValue != null) {
         var fieldEntityHandler = entityHandler.getEntityHandler(
-          type:
-              fieldType.isListEntityOrReference
-                  ? fieldType.listEntityOrReferenceType!.type
-                  : fieldType.type,
+          type: fieldType.isListEntityOrReference
+              ? fieldType.listEntityOrReferenceType!.type
+              : fieldType.type,
         );
 
         if (fieldValue is EntityReferenceBase) {
@@ -944,23 +937,18 @@ class DBRelationalEntityRepository<O extends Object>
 
         if (fieldEntityHandler != null) {
           if (fieldValue is Iterable) {
-            var fieldIds =
-                fieldValue
-                    .map(
-                      (Object? e) =>
-                          fieldEntityHandler.isEntityInstance(e)
-                              ? fieldEntityHandler.getID(e)
-                              : (e.isEntityIDType ? e : null),
-                    )
-                    .toList();
+            var fieldIds = fieldValue
+                .map(
+                  (Object? e) => fieldEntityHandler.isEntityInstance(e)
+                      ? fieldEntityHandler.getID(e)
+                      : (e.isEntityIDType ? e : null),
+                )
+                .toList();
             return fieldIds;
           } else {
-            var fieldId =
-                fieldEntityHandler.isEntityInstance(fieldValue)
-                    ? fieldEntityHandler.getID(fieldValue)
-                    : ((fieldValue as Object?).isEntityIDType
-                        ? fieldValue
-                        : null);
+            var fieldId = fieldEntityHandler.isEntityInstance(fieldValue)
+                ? fieldEntityHandler.getID(fieldValue)
+                : ((fieldValue as Object?).isEntityIDType ? fieldValue : null);
             return [fieldId];
           }
         }
@@ -986,44 +974,43 @@ class DBRelationalEntityRepository<O extends Object>
 
     if (cachedEntities != null && cachedEntities.isNotEmpty) {
       var fieldEntityHandler = entityHandler.getEntityHandler(
-        type:
-            fieldType.isListEntityOrReference
-                ? fieldType.arguments0!.type
-                : fieldType.type,
+        type: fieldType.isListEntityOrReference
+            ? fieldType.arguments0!.type
+            : fieldType.type,
       );
 
       if (fieldEntityHandler == null) return null;
 
-      var relationshipEntries =
-          cachedEntities.entries.map((e) {
-            var id = e.key;
-            var entity = e.value;
-
-            var fieldValue = entityHandler.getField(entity as dynamic, field);
-
-            if (fieldValue != null) {
-              if (fieldValue is Iterable) {
-                var fieldIds =
-                    fieldValue.map((e) => fieldEntityHandler.getID(e)).toList();
-                return MapEntry(id, fieldIds);
-              } else if (fieldValue is EntityReferenceList) {
-                var fieldIds =
-                    fieldValue.entities
-                        ?.map((e) => fieldEntityHandler.getID(e))
-                        .toList() ??
-                    [];
-                return MapEntry(id, fieldIds);
-              } else if (fieldValue is EntityReference) {
-                var fieldId = fieldEntityHandler.getID(fieldValue.entity);
-                return MapEntry(id, [fieldId]);
-              } else {
-                var fieldId = fieldEntityHandler.getID(fieldValue);
-                return MapEntry(id, [fieldId]);
-              }
-            }
+      var relationshipEntries = cachedEntities.entries.map((e) {
+        var id = e.key;
+        var entity = e.value;
+
+        var fieldValue = entityHandler.getField(entity as dynamic, field);
+
+        if (fieldValue != null) {
+          if (fieldValue is Iterable) {
+            var fieldIds = fieldValue
+                .map((e) => fieldEntityHandler.getID(e))
+                .toList();
+            return MapEntry(id, fieldIds);
+          } else if (fieldValue is EntityReferenceList) {
+            var fieldIds =
+                fieldValue.entities
+                    ?.map((e) => fieldEntityHandler.getID(e))
+                    .toList() ??
+                [];
+            return MapEntry(id, fieldIds);
+          } else if (fieldValue is EntityReference) {
+            var fieldId = fieldEntityHandler.getID(fieldValue.entity);
+            return MapEntry(id, [fieldId]);
+          } else {
+            var fieldId = fieldEntityHandler.getID(fieldValue);
+            return MapEntry(id, [fieldId]);
+          }
+        }
 
-            return null;
-          }).nonNulls;
+        return null;
+      }).nonNulls;
 
       var relationships = Map.fromEntries(relationshipEntries);
 
@@ -1043,13 +1030,15 @@ class DBRelationalEntityRepository<O extends Object>
     TypeInfo? fieldType,
     Transaction? transaction,
   }) {
-    oIds ??=
-        os!
-            .map((o) => getID(o, entityHandler: entityHandler)! as Object)
-            .toList();
+    oIds ??= os!
+        .map((o) => getID(o, entityHandler: entityHandler)! as Object)
+        .toList();
 
-    fieldType ??=
-        entityHandler.getFieldType(os?.first, field, resolveFiledName: true)!;
+    fieldType ??= entityHandler.getFieldType(
+      os?.first,
+      field,
+      resolveFiledName: true,
+    )!;
 
     if (oIds.isEmpty) {
       return <dynamic, Iterable<dynamic>>{};
diff --git a/lib/src/bones_api_entity_db_sql.dart b/lib/src/bones_api_entity_db_sql.dart
index 8aadabaf..e4a7dde6 100644
--- a/lib/src/bones_api_entity_db_sql.dart
+++ b/lib/src/bones_api_entity_db_sql.dart
@@ -624,91 +624,66 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
   FutureOr<bool> _checkDBTablesImpl(
     Map<EntityRepository<Object>, TableScheme?> repositorySchemes,
   ) {
-    var repositoriesChecks =
-        repositorySchemes.entries
-            .map((e) => _checkDBTableScheme(e.key, e.value))
-            .toList();
+    var repositoriesChecks = repositorySchemes.entries
+        .map((e) => _checkDBTableScheme(e.key, e.value))
+        .toList();
 
-    var repositoriesChecksErrors =
-        repositoriesChecks.where((e) => e.isError).toList();
+    var repositoriesChecksErrors = repositoriesChecks
+        .where((e) => e.isError)
+        .toList();
 
     if (repositoriesChecksErrors.isNotEmpty) {
-      var missingColumnsSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingColumns?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingColumnsSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingReferenceColumnsSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingReferenceColumns?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingReferenceColumnsSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingReferenceConstraintsSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingReferenceConstraints?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingReferenceConstraintsSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingReferenceIndexesSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingReferenceIndexes?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingReferenceIndexesSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingRelationshipReferenceIndexesSQLs =
-          repositoriesChecksErrors
-              .where(
-                (e) =>
-                    e.missingRelationshipReferenceIndexes?.isNotEmpty ?? false,
-              )
-              .expand(
-                (e) => e.generateMissingRelationshipReferenceIndexesSQLs(this),
-              )
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingUniqueConstraintsSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingUniqueConstraints?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingUniqueConstraintsSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingEnumConstraintsSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingEnumConstraints?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingEnumConstraintsSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
-
-      var missingEnumValuesSQLs =
-          repositoriesChecksErrors
-              .where((e) => e.missingEnumValues?.isNotEmpty ?? false)
-              .expand((e) => e.generateMissingEnumValuesSQLs(this))
-              .expand(
-                (e) => e.buildAllSQLs(ifNotExists: true, multiline: false),
-              )
-              .toList();
+      var missingColumnsSQLs = repositoriesChecksErrors
+          .where((e) => e.missingColumns?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingColumnsSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingReferenceColumnsSQLs = repositoriesChecksErrors
+          .where((e) => e.missingReferenceColumns?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingReferenceColumnsSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingReferenceConstraintsSQLs = repositoriesChecksErrors
+          .where((e) => e.missingReferenceConstraints?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingReferenceConstraintsSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingReferenceIndexesSQLs = repositoriesChecksErrors
+          .where((e) => e.missingReferenceIndexes?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingReferenceIndexesSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingRelationshipReferenceIndexesSQLs = repositoriesChecksErrors
+          .where(
+            (e) => e.missingRelationshipReferenceIndexes?.isNotEmpty ?? false,
+          )
+          .expand(
+            (e) => e.generateMissingRelationshipReferenceIndexesSQLs(this),
+          )
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingUniqueConstraintsSQLs = repositoriesChecksErrors
+          .where((e) => e.missingUniqueConstraints?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingUniqueConstraintsSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingEnumConstraintsSQLs = repositoriesChecksErrors
+          .where((e) => e.missingEnumConstraints?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingEnumConstraintsSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
+
+      var missingEnumValuesSQLs = repositoriesChecksErrors
+          .where((e) => e.missingEnumValues?.isNotEmpty ?? false)
+          .expand((e) => e.generateMissingEnumValuesSQLs(this))
+          .expand((e) => e.buildAllSQLs(ifNotExists: true, multiline: false))
+          .toList();
 
       var alterTablesSQLs = [
         ...missingColumnsSQLs,
@@ -728,16 +703,15 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
         ...missingEnumValuesSQLs,
       ];
 
-      alterTablesSQLs =
-          alterTablesSQLs.expandIndexed((i, s) {
-            if (i > 0 && s.isEmpty) {
-              var prev = alterTablesSQLs[i - 1];
-              if (prev.isEmpty) {
-                return <String>[];
-              }
-            }
-            return [s];
-          }).toList();
+      alterTablesSQLs = alterTablesSQLs.expandIndexed((i, s) {
+        if (i > 0 && s.isEmpty) {
+          var prev = alterTablesSQLs[i - 1];
+          if (prev.isEmpty) {
+            return <String>[];
+          }
+        }
+        return [s];
+      }).toList();
 
       while (alterTablesSQLs.isNotEmpty && alterTablesSQLs.first.isEmpty) {
         alterTablesSQLs.removeAt(0);
@@ -799,8 +773,9 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
 
     var repoFieldsNames = entityFields.whereNotIn(hiddenFields).toList();
 
-    var repoFieldsMap =
-        repoFieldsNames.map((f) => MapEntry(f, f)).toMapFromEntries();
+    var repoFieldsMap = repoFieldsNames
+        .map((f) => MapEntry(f, f))
+        .toMapFromEntries();
 
     var repoTable = getTableForEntityRepository(repository);
 
@@ -809,16 +784,15 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
       repoFieldsMap,
     );
 
-    var schemesTypes =
-        schemeToRepoMap.entries
-            .map((e) {
-              var schemeField = e.key;
-              var repoField = e.value;
-              if (repoField == null) return null;
-              return MapEntry(repoField, scheme.fieldsTypes[schemeField]);
-            })
-            .nonNulls
-            .toMapFromEntries();
+    var schemesTypes = schemeToRepoMap.entries
+        .map((e) {
+          var schemeField = e.key;
+          var repoField = e.value;
+          if (repoField == null) return null;
+          return MapEntry(repoField, scheme.fieldsTypes[schemeField]);
+        })
+        .nonNulls
+        .toMapFromEntries();
 
     for (var e in schemesTypes.entries) {
       var field = e.key;
@@ -838,58 +812,54 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
 
     var fieldsInScheme = schemeToRepoMap.values.toList();
 
-    var repoFieldsNotInScheme =
-        repoFieldsNames.whereNot((f) => fieldsInScheme.contains(f)).toList();
-
-    var referenceFields =
-        repoFieldsNotInScheme
-            .map(
-              (f) => _checkDBTableSchemeReferenceField(
-                entityHandler,
-                scheme,
-                repoTable,
-                f,
-                allowCollectionFields: false,
-              ),
-            )
-            .nonNulls
-            .toMapFromEntries();
-
-    var collectionReferenceFields =
-        repoFieldsNotInScheme
-            .map(
-              (f) => _checkDBTableSchemeReferenceField(
-                entityHandler,
-                scheme,
-                repoTable,
-                f,
-                allowCollectionFields: true,
-              ),
-            )
-            .nonNulls
-            .toMapFromEntries();
-
-    var missingReferenceColumns =
-        referenceFields.entries
-            .where((e) => e.value == null)
-            .map((e) => e.key)
-            .toList();
-
-    var missingCollectionReferenceColumns =
-        collectionReferenceFields.entries
-            .where((e) => e.value == null)
-            .map((e) => e.key)
-            .toList();
-
-    var missingColumns =
-        repoFieldsNames
-            .whereNot(
-              (f) =>
-                  fieldsInScheme.contains(f) ||
-                  referenceFields.containsKey(f) ||
-                  collectionReferenceFields.containsKey(f),
-            )
-            .toList();
+    var repoFieldsNotInScheme = repoFieldsNames
+        .whereNot((f) => fieldsInScheme.contains(f))
+        .toList();
+
+    var referenceFields = repoFieldsNotInScheme
+        .map(
+          (f) => _checkDBTableSchemeReferenceField(
+            entityHandler,
+            scheme,
+            repoTable,
+            f,
+            allowCollectionFields: false,
+          ),
+        )
+        .nonNulls
+        .toMapFromEntries();
+
+    var collectionReferenceFields = repoFieldsNotInScheme
+        .map(
+          (f) => _checkDBTableSchemeReferenceField(
+            entityHandler,
+            scheme,
+            repoTable,
+            f,
+            allowCollectionFields: true,
+          ),
+        )
+        .nonNulls
+        .toMapFromEntries();
+
+    var missingReferenceColumns = referenceFields.entries
+        .where((e) => e.value == null)
+        .map((e) => e.key)
+        .toList();
+
+    var missingCollectionReferenceColumns = collectionReferenceFields.entries
+        .where((e) => e.value == null)
+        .map((e) => e.key)
+        .toList();
+
+    var missingColumns = repoFieldsNames
+        .whereNot(
+          (f) =>
+              fieldsInScheme.contains(f) ||
+              referenceFields.containsKey(f) ||
+              collectionReferenceFields.containsKey(f),
+        )
+        .toList();
 
     var missingFieldReferenceConstraints = <String>{};
     var missingFieldReferenceIndexes = <String>{};
@@ -906,137 +876,136 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
 
       // REF CONSTRAINTS //
 
-      var fieldEntityTypes =
-          entityHandler
-              .getFieldsEntityTypes()
-              .entries
-              .map((e) {
-                var entityType = e.value.entityType;
-                if (entityType == null) return null;
+      var fieldEntityTypes = entityHandler
+          .getFieldsEntityTypes()
+          .entries
+          .map((e) {
+            var entityType = e.value.entityType;
+            if (entityType == null) return null;
 
-                var refRepository = repository.provider
-                    .getEntityRepositoryByType(entityType);
+            var refRepository = repository.provider.getEntityRepositoryByType(
+              entityType,
+            );
 
-                if (refRepository == null ||
-                    !refRepository.isSameEntityManager(repository)) {
-                  return null;
-                }
+            if (refRepository == null ||
+                !refRepository.isSameEntityManager(repository)) {
+              return null;
+            }
 
-                return MapEntry(e.key, entityType);
-              })
-              .nonNulls
-              .toMapFromEntries();
+            return MapEntry(e.key, entityType);
+          })
+          .nonNulls
+          .toMapFromEntries();
 
       if (fieldEntityTypes.isNotEmpty) {
         var fieldsReferencedTables = scheme.fieldsReferencedTables;
 
-        var fieldsReferences =
-            fieldsReferencedTables.entries
-                .map((e) {
-                  var colum = e.key;
-                  var field = schemeToRepoMap[colum] ?? colum;
+        var fieldsReferences = fieldsReferencedTables.entries
+            .map((e) {
+              var colum = e.key;
+              var field = schemeToRepoMap[colum] ?? colum;
 
-                  var entityType = fieldEntityTypes[field];
-                  if (entityType == null) return null;
+              var entityType = fieldEntityTypes[field];
+              if (entityType == null) return null;
 
-                  var refTable = e.value.targetTable;
-                  return MapEntry(field, refTable);
-                })
-                .nonNulls
-                .toMapFromEntries();
+              var refTable = e.value.targetTable;
+              return MapEntry(field, refTable);
+            })
+            .nonNulls
+            .toMapFromEntries();
 
-        missingFieldReferenceConstraints =
-            fieldEntityTypes.keys
-                .where((f) => !fieldsReferences.containsKey(f))
-                .toSet();
+        missingFieldReferenceConstraints = fieldEntityTypes.keys
+            .where((f) => !fieldsReferences.containsKey(f))
+            .toSet();
 
         if (!dialect.foreignKeyCreatesImplicitIndex) {
-          missingFieldReferenceIndexes =
-              fieldsReferencedTables.entries
-                  .where((e) => e.value.indexName == null)
-                  .map((e) => e.key)
-                  .toSet();
+          missingFieldReferenceIndexes = fieldsReferencedTables.entries
+              .where((e) => e.value.indexName == null)
+              .map((e) => e.key)
+              .toSet();
         }
       }
 
       // RELATIONSHIP CONSTRAINTS //
 
-      var fieldListEntityTypes =
-          entityHandler
-              .getFieldsListEntityTypes()
-              .entries
-              .map((e) {
-                var entityType = e.value.entityType;
-                if (entityType == null) return null;
+      var fieldListEntityTypes = entityHandler
+          .getFieldsListEntityTypes()
+          .entries
+          .map((e) {
+            var entityType = e.value.entityType;
+            if (entityType == null) return null;
 
-                var refRepository = repository.provider
-                    .getEntityRepositoryByType(entityType);
+            var refRepository = repository.provider.getEntityRepositoryByType(
+              entityType,
+            );
 
-                if (refRepository == null ||
-                    !refRepository.isSameEntityManager(repository)) {
-                  return null;
-                }
+            if (refRepository == null ||
+                !refRepository.isSameEntityManager(repository)) {
+              return null;
+            }
 
-                return MapEntry(e.key, entityType);
-              })
-              .nonNulls
-              .toMapFromEntries();
+            return MapEntry(e.key, entityType);
+          })
+          .nonNulls
+          .toMapFromEntries();
 
       if (fieldListEntityTypes.isNotEmpty) {
         if (!dialect.foreignKeyCreatesImplicitIndex) {
-          missingRelationshipFieldReferenceIndexes =
-              collectionReferenceFields.entries
-                  .expand((e) {
-                    var relFieldRef = e.value;
-                    if (relFieldRef == null) {
-                      return <(String, String, TypeInfo)>[];
-                    }
-
-                    return [
-                      if (relFieldRef.sourceRelationshipFieldIndex == null)
-                        (
-                          relFieldRef.relationshipTable,
-                          relFieldRef.sourceRelationshipField,
-                          relFieldRef.sourceFieldEntityType,
-                        ),
-                      if (relFieldRef.targetRelationshipFieldIndex == null)
-                        (
-                          relFieldRef.relationshipTable,
-                          relFieldRef.targetRelationshipField,
-                          relFieldRef.targetFieldEntityType,
-                        ),
-                    ];
-                  })
-                  .nonNulls
-                  .toSet();
+          missingRelationshipFieldReferenceIndexes = collectionReferenceFields
+              .entries
+              .expand((e) {
+                var relFieldRef = e.value;
+                if (relFieldRef == null) {
+                  return <(String, String, TypeInfo)>[];
+                }
+
+                return [
+                  if (relFieldRef.sourceRelationshipFieldIndex == null)
+                    (
+                      relFieldRef.relationshipTable,
+                      relFieldRef.sourceRelationshipField,
+                      relFieldRef.sourceFieldEntityType,
+                    ),
+                  if (relFieldRef.targetRelationshipFieldIndex == null)
+                    (
+                      relFieldRef.relationshipTable,
+                      relFieldRef.targetRelationshipField,
+                      relFieldRef.targetFieldEntityType,
+                    ),
+                ];
+              })
+              .nonNulls
+              .toSet();
         }
       }
 
       // UNIQUE CONSTRAINTS //
 
-      var uniqueConstraints =
-          scheme.constraints.whereType<TableUniqueConstraint>().toList();
+      var uniqueConstraints = scheme.constraints
+          .whereType<TableUniqueConstraint>()
+          .toList();
 
       var uniqueConstraintsFields = uniqueConstraints.toFields(
         fieldMap: schemeToRepoMap,
       );
 
-      var entityUniqueFields =
-          entityHandler
-              .getAllFieldsWithEntityAnnotation<EntityField>(
-                null,
-                (a) => a.isUnique,
-              )
-              .keys
-              .toList();
+      var entityUniqueFields = entityHandler
+          .getAllFieldsWithEntityAnnotation<EntityField>(
+            null,
+            (a) => a.isUnique,
+          )
+          .keys
+          .toList();
 
-      missingUniqueConstraints =
-          entityUniqueFields.whereNotIn(uniqueConstraintsFields).toSet();
+      missingUniqueConstraints = entityUniqueFields
+          .whereNotIn(uniqueConstraintsFields)
+          .toSet();
 
       // ENUM CONSTRAINTS //
 
-      var enumConstraints =
-          scheme.constraints.whereType<TableEnumConstraint>().toList();
+      var enumConstraints = scheme.constraints
+          .whereType<TableEnumConstraint>()
+          .toList();
 
       var enumConstraintsFields = enumConstraints.toFields(
         fieldMap: schemeToRepoMap,
@@ -1044,8 +1013,9 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
 
       var entityEnumFields = entityHandler.getFieldsEnumTypes().keys.toList();
 
-      missingEnumConstraints =
-          entityEnumFields.whereNotIn(enumConstraintsFields).toSet();
+      missingEnumConstraints = entityEnumFields
+          .whereNotIn(enumConstraintsFields)
+          .toSet();
 
       var entityFieldsNamesIndexes = entityHandler.fieldsNamesIndexes();
       var entityFieldsNames = entityHandler.fieldsNames();
@@ -1245,8 +1215,9 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
 
   Future<Map<EntityRepository<Object>, TableScheme?>>
   getRepositoriesSchemes() async {
-    var reposBlocks =
-        entityRepositories.splitBeforeIndexed((i, r) => i % 2 == 0).toList();
+    var reposBlocks = entityRepositories
+        .splitBeforeIndexed((i, r) => i % 2 == 0)
+        .toList();
 
     final allSchemes = <EntityRepository<Object>, TableScheme?>{};
 
@@ -1255,16 +1226,15 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
     final contextID = List.unmodifiable([this, "getRepositoriesSchemes"]);
 
     for (var block in reposBlocks) {
-      var repositorySchemes =
-          await block
-              .map(
-                (r) => MapEntry(
-                  r,
-                  getTableSchemeForEntityRepository(r, contextID: contextID),
-                ),
-              )
-              .toMapFromEntries()
-              .resolveAllValues();
+      var repositorySchemes = await block
+          .map(
+            (r) => MapEntry(
+              r,
+              getTableSchemeForEntityRepository(r, contextID: contextID),
+            ),
+          )
+          .toMapFromEntries()
+          .resolveAllValues();
 
       allSchemes.addAll(repositorySchemes);
     }
@@ -1492,20 +1462,19 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
     bool ifNotExists = true,
     bool sortColumns = true,
     bool verbose = false,
-  }) =>
-      entityRepositories
-          .map(
-            (r) => MapEntry<EntityRepository, CreateTableSQL>(
-              r,
-              generateCreateTableSQL(
-                entityRepository: r,
-                ifNotExists: ifNotExists,
-                sortColumns: sortColumns,
-              ),
-            ),
-          )
-          .toHierarchicalOrder(verbose: verbose)
-          .toMapFromEntries();
+  }) => entityRepositories
+      .map(
+        (r) => MapEntry<EntityRepository, CreateTableSQL>(
+          r,
+          generateCreateTableSQL(
+            entityRepository: r,
+            ifNotExists: ifNotExists,
+            sortColumns: sortColumns,
+          ),
+        ),
+      )
+      .toHierarchicalOrder(verbose: verbose)
+      .toMapFromEntries();
 
   /// Generate all the SQLs to create the tables.
   @override
@@ -1518,11 +1487,10 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
       sortColumns: sortColumns,
     );
 
-    var allSQLs =
-        sqls.values
-            .expand((e) => e.allSQLBuilders)
-            .toList()
-            .toHierarchicalOrder();
+    var allSQLs = sqls.values
+        .expand((e) => e.allSQLBuilders)
+        .toList()
+        .toHierarchicalOrder();
 
     return allSQLs;
   }
@@ -1558,16 +1526,12 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
     String fieldName,
     Object? value,
     Map<String, Object?> fieldsValues,
-  ) => _resolveFieldValueToSQL(
-    context,
-    tableScheme,
-    fieldName,
-    value,
-  ).resolveMapped((refId) {
-    fieldsValues.putIfAbsent(fieldName, () => refId);
-    var valueSQL = _conditionSQLGenerator.parameterPlaceholder(fieldName);
-    return valueSQL;
-  });
+  ) => _resolveFieldValueToSQL(context, tableScheme, fieldName, value)
+      .resolveMapped((refId) {
+        fieldsValues.putIfAbsent(fieldName, () => refId);
+        var valueSQL = _conditionSQLGenerator.parameterPlaceholder(fieldName);
+        return valueSQL;
+      });
 
   FutureOr<Object?> _resolveFieldValueToSQL(
     EncodingContext context,
@@ -1601,10 +1565,9 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
 
       var refEntityHandler = refEntityRepository.entityHandler;
 
-      var refId =
-          fieldRef != null
-              ? refEntityHandler.getField(refEntity, fieldRef.targetField)
-              : refEntityHandler.getID(refEntity);
+      var refId = fieldRef != null
+          ? refEntityHandler.getField(refEntity, fieldRef.targetField)
+          : refEntityHandler.getID(refEntity);
 
       if (refId != null) return refId;
 
@@ -2121,18 +2084,14 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
         );
       }
 
-      var sqls =
-          otherIds.isEmpty
-              ? [SQL.dummy]
-              : otherIds
-                  .map(
-                    (otherId) => _generateInsertRelationshipSQL(
-                      relationship,
-                      id,
-                      otherId,
-                    ),
-                  )
-                  .toList();
+      var sqls = otherIds.isEmpty
+          ? [SQL.dummy]
+          : otherIds
+                .map(
+                  (otherId) =>
+                      _generateInsertRelationshipSQL(relationship, id, otherId),
+                )
+                .toList();
 
       var constrainSQL = _generateConstrainRelationshipSQL(
         tableScheme,
@@ -2297,37 +2256,32 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
     return executeTransactionOperation(op, sqls.first, (connection) {
       _logTransactionOperationSQL('insertRelationshipSQLs', op, sqls);
 
-      var retInserts =
-          sqls.map((sql) {
-            var ret = doInsertRelationshipSQL(
-              entityName,
-              sql.mainTable ?? table,
-              sql,
-              op.transaction,
-              connection,
-            );
+      var retInserts = sqls.map((sql) {
+        var ret = doInsertRelationshipSQL(
+          entityName,
+          sql.mainTable ?? table,
+          sql,
+          op.transaction,
+          connection,
+        );
 
-            if (sql.hasPosSQL) {
-              return sql.posSQL!
-                  .map((e) {
-                    _logTransactionOperationSQL(
-                      'insertRelationship[POS]',
-                      op,
-                      e,
-                    );
-                    return doDeleteSQL(
-                      entityName,
-                      e.mainTable!,
-                      e,
-                      op.transaction,
-                      connection,
-                    );
-                  })
-                  .resolveAllWithValue(ret);
-            } else {
-              return ret;
-            }
-          }).resolveAll();
+        if (sql.hasPosSQL) {
+          return sql.posSQL!
+              .map((e) {
+                _logTransactionOperationSQL('insertRelationship[POS]', op, e);
+                return doDeleteSQL(
+                  entityName,
+                  e.mainTable!,
+                  e,
+                  op.transaction,
+                  connection,
+                );
+              })
+              .resolveAllWithValue(ret);
+        } else {
+          return ret;
+        }
+      }).resolveAll();
       return retInserts.resolveWithValue(true);
     });
   }
@@ -2563,14 +2517,13 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
     if (isTransactionWithSingleOperation(op, sql)) {
       return executeWithPool(
         f,
-        onError:
-            (e, s) => transaction.notifyExecutionError(
-              e,
-              s,
-              errorResolver: resolveError,
-              operation: op,
-              debugInfo: () => sql.mainSQL.toString(),
-            ),
+        onError: (e, s) => transaction.notifyExecutionError(
+          e,
+          s,
+          errorResolver: resolveError,
+          operation: op,
+          debugInfo: () => sql.mainSQL.toString(),
+        ),
       );
     }
 
@@ -3052,7 +3005,13 @@ abstract class DBSQLAdapter<C extends Object> extends DBRelationalAdapter<C>
         sql.write(from);
 
         if (dialect.acceptsReturningSyntax) {
-          sql.write(' RETURNING "$tableAlias".*');
+          // Some dialects (SQLite) reject a table-qualified wildcard:
+          // "RETURNING may not use TABLE.* wildcards".
+          if (dialect.returningAcceptsTableWildcard) {
+            sql.write(' RETURNING "$tableAlias".*');
+          } else {
+            sql.write(' RETURNING *');
+          }
         }
 
         return sql.toString();
@@ -3601,8 +3560,9 @@ class _DBTableCheck {
       sqlGenerator,
     );
 
-    var constraints =
-        columnsSQLs.expand((e) => e.constraints ?? <AlterTableSQL>[]).toList();
+    var constraints = columnsSQLs
+        .expand((e) => e.constraints ?? <AlterTableSQL>[])
+        .toList();
 
     return constraints;
   }
@@ -3615,8 +3575,9 @@ class _DBTableCheck {
       sqlGenerator,
     );
 
-    var indexes =
-        columnsSQLs.expand((e) => e.indexes ?? <CreateIndexSQL>[]).toList();
+    var indexes = columnsSQLs
+        .expand((e) => e.indexes ?? <CreateIndexSQL>[])
+        .toList();
 
     return indexes;
   }
@@ -3629,8 +3590,9 @@ class _DBTableCheck {
       sqlGenerator,
     );
 
-    var indexes =
-        columnsSQLs.expand((e) => e.indexes ?? <CreateIndexSQL>[]).toList();
+    var indexes = columnsSQLs
+        .expand((e) => e.indexes ?? <CreateIndexSQL>[])
+        .toList();
 
     return indexes;
   }
@@ -3663,19 +3625,17 @@ class _DBTableCheck {
       return [];
     }
 
-    var sqls =
-        missing.map((f) {
-          var schemeName =
-              f is _DBRelationshipTableColumn
-                  ? f.relationshipTable
-                  : scheme.name;
-          return sqlGenerator.generateAddColumnAlterTableSQL(
-            schemeName,
-            f.name,
-            f.type,
-            entityFieldAnnotations: f.annotations,
-          );
-        }).toList();
+    var sqls = missing.map((f) {
+      var schemeName = f is _DBRelationshipTableColumn
+          ? f.relationshipTable
+          : scheme.name;
+      return sqlGenerator.generateAddColumnAlterTableSQL(
+        schemeName,
+        f.name,
+        f.type,
+        entityFieldAnnotations: f.annotations,
+      );
+    }).toList();
 
     return sqls;
   }
@@ -3689,15 +3649,14 @@ class _DBTableCheck {
       return [];
     }
 
-    var sqls =
-        missing.map((f) {
-          return sqlGenerator.generateAddUniqueConstraintAlterTableSQL(
-            scheme.name,
-            f.name,
-            f.type,
-            entityFieldAnnotations: f.annotations,
-          );
-        }).toList();
+    var sqls = missing.map((f) {
+      return sqlGenerator.generateAddUniqueConstraintAlterTableSQL(
+        scheme.name,
+        f.name,
+        f.type,
+        entityFieldAnnotations: f.annotations,
+      );
+    }).toList();
 
     return sqls;
   }
@@ -3711,15 +3670,14 @@ class _DBTableCheck {
       return [];
     }
 
-    var sqls =
-        missing.map((f) {
-          return sqlGenerator.generateAddEnumConstraintAlterTableSQL(
-            scheme.name,
-            f.name,
-            f.type,
-            entityFieldAnnotations: f.annotations,
-          );
-        }).toList();
+    var sqls = missing.map((f) {
+      return sqlGenerator.generateAddEnumConstraintAlterTableSQL(
+        scheme.name,
+        f.name,
+        f.type,
+        entityFieldAnnotations: f.annotations,
+      );
+    }).toList();
 
     return sqls;
   }
@@ -3824,11 +3782,10 @@ class _DBTableColumn {
         entityHandler.getFieldType(null, fieldName, resolveFiledName: true) ??
         TypeInfo.tString;
 
-    var annotations =
-        entityHandler
-            .getFieldEntityAnnotations(null, fieldName)
-            ?.whereType<EntityField>()
-            .toList();
+    var annotations = entityHandler
+        .getFieldEntityAnnotations(null, fieldName)
+        ?.whereType<EntityField>()
+        .toList();
     return _DBTableColumn(fieldName, type, annotations);
   }
 
diff --git a/lib/src/bones_api_entity_db_sqlite.dart b/lib/src/bones_api_entity_db_sqlite.dart
new file mode 100644
index 00000000..3a4ca12c
--- /dev/null
+++ b/lib/src/bones_api_entity_db_sqlite.dart
@@ -0,0 +1,1370 @@
+import 'dart:typed_data';
+
+import 'package:async_extension/async_extension.dart';
+import 'package:collection/collection.dart';
+import 'package:logging/logging.dart' as logging;
+import 'package:sqlite3/sqlite3.dart';
+import 'package:statistics/statistics.dart';
+
+import 'bones_api_condition_encoder.dart';
+import 'bones_api_entity.dart';
+import 'bones_api_entity_annotation.dart';
+import 'bones_api_entity_db.dart';
+import 'bones_api_entity_db_sql.dart';
+import 'bones_api_initializable.dart';
+import 'bones_api_logging.dart';
+import 'bones_api_sql_builder.dart';
+import 'bones_api_types.dart';
+import 'bones_api_utils.dart';
+import 'bones_api_utils_timedmap.dart';
+
+final _log = logging.Logger('DBSQLiteAdapter')..registerAsDbLogger();
+
+/// The `:memory:` path accepted by [DBSQLiteAdapter] to select an in-memory
+/// database.
+const String sqliteMemoryPath = ':memory:';
+
+/// A SQLite adapter, backed by the `sqlite3` package (bundled SQLite, `dart:ffi`).
+///
+/// Supports both file databases and in-memory databases (see [inMemory]).
+///
+/// ## Single native handle
+///
+/// The `sqlite3` driver is **synchronous** and SQLite allows a single writer at
+/// a time. Two native handles in one isolate are a hazard rather than a benefit:
+/// a handle blocking on a lock stalls the whole isolate, so the handle holding
+/// the lock could never reach its `COMMIT` — `busy_timeout` would elapse and the
+/// statement would fail with *"database is locked"*. And there is nothing to
+/// gain, since a synchronous driver has no I/O wait to overlap.
+///
+/// So this adapter opens exactly **one** [Database] and every pooled
+/// [DBSQLiteConnectionWrapper] is a cheap view over it. This also makes
+/// [inMemory] work without any URI/shared-cache trickery (each
+/// `sqlite3.openInMemory()` would otherwise be a *separate* database, and the
+/// bundled SQLite is compiled with `OMIT_SHARED_CACHE`), and it keeps the
+/// [Pool] machinery intact — note that [Pool.catchFromPool] force-creates
+/// elements beyond [maxConnections] under contention, so capping the pool at 1
+/// would *not* have been enough to guarantee a single handle.
+///
+/// The trade-off is that a statement issued outside the current transaction
+/// while one is open participates in it, and is committed or rolled back with
+/// it. In a single isolate that can only happen for genuinely interleaved work.
+/// A transaction started while another is already open nests as a `SAVEPOINT`
+/// rather than failing on a second `BEGIN`.
+class DBSQLiteAdapter extends DBSQLAdapter<DBSQLiteConnectionWrapper>
+    implements WithRuntimeTypeNameSafe {
+  @override
+  String get runtimeTypeNameSafe => 'DBSQLiteAdapter';
+
+  static bool _boot = false;
+
+  static void boot() {
+    if (_boot) return;
+    _boot = true;
+
+    DBSQLAdapter.boot();
+
+    Transaction.registerErrorFilter(
+      (e, s) => e is SqliteException || e is _SQLiteStatementException,
+    );
+
+    DBSQLAdapter.registerAdapter(
+      ['sql.sqlite', 'sql.sqlite3', 'sqlite', 'sqlite3'],
+      DBSQLiteAdapter,
+      _instantiate,
+    );
+  }
+
+  static FutureOr<DBSQLiteAdapter?> _instantiate(
+    config, {
+    int? minConnections,
+    int? maxConnections,
+    EntityRepositoryProvider? parentRepositoryProvider,
+    String? workingPath,
+  }) {
+    try {
+      return DBSQLiteAdapter.fromConfig(
+        config,
+        parentRepositoryProvider: parentRepositoryProvider,
+        workingPath: workingPath,
+      );
+    } catch (e, s) {
+      _log.severe("Error instantiating from config", e, s);
+      return null;
+    }
+  }
+
+  /// The database file path, or [sqliteMemoryPath] for an in-memory database.
+  final String databasePath;
+
+  /// If `true` this is an in-memory database (not backed by a file).
+  final bool inMemory;
+
+  /// The `busy_timeout` (in milliseconds) applied to the database handle.
+  ///
+  /// Only guards against *other OS processes* holding the database file: this
+  /// adapter uses a single handle, so it can never contend with itself.
+  final int busyTimeout;
+
+  /// The single native handle shared by every pooled connection wrapper.
+  Database? _database;
+
+  DBSQLiteAdapter(
+    String databasePath, {
+    int? busyTimeout,
+    int minConnections = 1,
+    int maxConnections = 3,
+    super.generateTables,
+    super.checkTables,
+    super.populateTables,
+    super.populateSource,
+    super.populateSourceVariables,
+    super.parentRepositoryProvider,
+    super.workingPath,
+    super.logSQL,
+  }) : databasePath = databasePath,
+       inMemory = _isMemoryPath(databasePath),
+       busyTimeout = busyTimeout ?? 5000,
+       super(
+         'sqlite',
+         minConnections,
+         maxConnections,
+         DBSQLAdapterCapability(
+           dialect: const SQLDialect(
+             'SQLite',
+             elementQuote: '"',
+             acceptsReturningSyntax: true,
+             // SQLite rejects `RETURNING "alias".*`:
+             // "RETURNING may not use TABLE.* wildcards".
+             returningAcceptsTableWildcard: false,
+             acceptsInsertDefaultValues: true,
+             // `INSERT IGNORE` is MySQL-only; SQLite uses `ON CONFLICT`:
+             acceptsInsertIgnore: false,
+             acceptsInsertOnConflict: true,
+             acceptsVarcharWithoutMaximumSize: true,
+             // SQLite does NOT create an implicit index for a foreign key:
+             foreignKeyCreatesImplicitIndex: false,
+             createIndexIfNotExists: true,
+             // SQLite can't parse an `OFFSET` without a preceding `LIMIT`,
+             // and uses `LIMIT -1` as "no limit":
+             offsetRequiresLimit: true,
+             offsetMaxLimitValue: '-1',
+           ),
+           transactions: true,
+           transactionAbort: true,
+           tableSQL: true,
+           // SQLite can't `ALTER TABLE ... ADD CONSTRAINT`:
+           constraintSupport: false,
+           // A `sqlite3` handle can't be shared with another isolate:
+           multiIsolateSupport: false,
+           connectivity: DBAdapterCapabilityConnectivity.none,
+         ),
+       ) {
+    boot();
+
+    parentRepositoryProvider?.notifyKnownEntityRepositoryProvider(this);
+  }
+
+  static bool _isMemoryPath(String path) {
+    path = path.trim();
+    return path.isEmpty ||
+        path == sqliteMemoryPath ||
+        path.toLowerCase() == 'memory';
+  }
+
+  factory DBSQLiteAdapter.fromConfig(
+    Map<String, dynamic>? config, {
+    String? defaultDatabasePath,
+    EntityRepositoryProvider? parentRepositoryProvider,
+    String? workingPath,
+  }) {
+    boot();
+
+    var memory = config?['memory'] ?? config?['inMemory'];
+
+    String? path =
+        (config?['path'] ??
+                config?['file'] ??
+                config?['database'] ??
+                config?['db'] ??
+                defaultDatabasePath)
+            ?.toString();
+
+    if (memory == true || (path == null && memory != false)) {
+      path = sqliteMemoryPath;
+    }
+
+    if (path == null) throw ArgumentError.notNull('path');
+
+    int? busyTimeout =
+        config?['busyTimeout'] ??
+        config?['busy-timeout'] ??
+        config?['busy_timeout'];
+
+    var (generateTables: generateTables, checkTables: checkTables) =
+        DBSQLAdapter.parseConfigDBGenerateTablesAndCheckTables(config);
+
+    var populate = config?['populate'];
+    Object? populateTables;
+    Object? populateSource;
+    Object? populateSourceVariables;
+
+    if (populate is Map) {
+      populateTables = populate['tables'];
+      populateSource = populate['source'];
+      populateSourceVariables = populate['variables'];
+    }
+
+    var logSql = DBSQLAdapter.parseConfigLogSQL(config) ?? false;
+
+    return DBSQLiteAdapter(
+      path,
+      busyTimeout: busyTimeout,
+      generateTables: generateTables,
+      checkTables: checkTables,
+      populateTables: populateTables,
+      populateSource: populateSource,
+      populateSourceVariables: populateSourceVariables,
+      parentRepositoryProvider: parentRepositoryProvider,
+      workingPath: workingPath,
+      logSQL: logSql,
+    );
+  }
+
+  @override
+  List<Initializable> initializeDependencies() {
+    var parentRepositoryProvider = this.parentRepositoryProvider;
+    return <Initializable>[
+      if (parentRepositoryProvider != null) parentRepositoryProvider,
+    ];
+  }
+
+  @override
+  SQLDialect get dialect => super.dialect as SQLDialect;
+
+  @override
+  String getConnectionURL(DBSQLiteConnectionWrapper connection) =>
+      'sqlite://$databasePath';
+
+  int _connectionCount = 0;
+
+  @override
+  DBSQLiteConnectionWrapper createConnection() {
+    var count = ++_connectionCount;
+
+    var connWrapper = _DBSQLiteConnectionWrapped(_openDatabase(), this);
+
+    _log.info(
+      'createConnection[#$count $poolAliveElementsSize/$maxConnections]> '
+      '${getConnectionURL(connWrapper)}',
+    );
+
+    return connWrapper;
+  }
+
+  /// Opens the shared handle on first use, then returns it.
+  Database _openDatabase() {
+    var db = _database;
+    if (db != null) return db;
+
+    db = _database = inMemory
+        ? sqlite3.openInMemory()
+        : sqlite3.open(databasePath);
+
+    // Foreign keys are OFF by default and are a per-connection setting.
+    db.execute('PRAGMA foreign_keys = ON');
+
+    if (!inMemory) {
+      db.execute('PRAGMA busy_timeout = $busyTimeout');
+      // WAL lets readers proceed while another *process* writes.
+      db.execute('PRAGMA journal_mode = WAL');
+      db.execute('PRAGMA synchronous = NORMAL');
+    }
+
+    return db;
+  }
+
+  /// Runs [sql] directly on the database handle, bypassing the entity layer.
+  ///
+  /// Useful for maintenance statements (`VACUUM`, `PRAGMA`, `ANALYZE`) and for
+  /// test harnesses that need to reach an [inMemory] database, which is
+  /// otherwise only accessible through this adapter's handle.
+  ResultSet executeRawSQL(String sql, [List<Object?>? parameters]) {
+    checkNotClosed();
+    return _openDatabase().select(sql, _normalizeParameters(parameters));
+  }
+
+  /// The names of the tables in this database (excluding SQLite's internal
+  /// `sqlite_*` tables).
+  List<String> listTablesNames() => executeRawSQL(
+    "SELECT name FROM sqlite_master "
+    "WHERE type = 'table' AND name NOT LIKE 'sqlite_%'",
+  ).map((r) => r['name'].toString()).toList();
+
+  @override
+  bool closeConnection(DBSQLiteConnectionWrapper connection) {
+    _log.info('closeConnection> $connection');
+    // Only marks the wrapper closed: the native handle is shared and is
+    // disposed by [close].
+    try {
+      connection.close();
+    } catch (_) {}
+    return true;
+  }
+
+  @override
+  bool close() {
+    if (!super.close()) return false;
+
+    var db = _database;
+    if (db != null) {
+      _database = null;
+      try {
+        db.close();
+      } catch (_) {}
+    }
+
+    return true;
+  }
+
+  @override
+  bool isPoolElementValid(
+    DBSQLiteConnectionWrapper o, {
+    bool checkUsage = true,
+  }) => isConnectionValid(o, checkUsage: checkUsage);
+
+  @override
+  FutureOr<bool> isPoolElementInvalid(
+    DBSQLiteConnectionWrapper o, {
+    bool checkUsage = true,
+  }) => !isConnectionValid(o, checkUsage: checkUsage);
+
+  @override
+  bool isConnectionValid(
+    DBSQLiteConnectionWrapper connection, {
+    bool checkUsage = true,
+  }) {
+    if (connection.isClosed) return false;
+
+    if (checkUsage && connection.isInactive(connectionInactivityLimit)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @override
+  DBSQLiteConnectionWrapper? recyclePoolElement(DBSQLiteConnectionWrapper o) {
+    // A transaction wrapper is bound to an open transaction: never recycle it.
+    if (o is _DBSQLiteConnectionTransaction) return null;
+    return o;
+  }
+
+  // -------------------------------------------------------------------------
+  // Scheme introspection (SQLite `PRAGMA`s, there is no `information_schema`).
+  // -------------------------------------------------------------------------
+
+  @override
+  FutureOr<Map<String, Type>?> getTableFieldsTypesImpl(String table) =>
+      executeWithPool((connection) {
+        _log.info('getTableFieldsTypesImpl> $table');
+
+        var columns = _tableInfo(connection, table);
+        if (columns.isEmpty) return null;
+
+        return _fieldsTypes(columns);
+      });
+
+  List<Row> _tableInfo(DBSQLiteConnectionWrapper connection, String table) {
+    // `table_info` accepts the table name as a bound parameter only through the
+    // table-valued form (`pragma_table_info`), which is what allows quoting it
+    // safely here:
+    return connection.select('SELECT * FROM pragma_table_info(?)', [
+      table,
+    ]).toList();
+  }
+
+  Map<String, Type> _fieldsTypes(List<Row> columns) {
+    return Map<String, Type>.fromEntries(
+      columns.map((c) {
+        var name = c['name'] as String;
+        var type = _toFieldType((c['type'] ?? '').toString());
+        return MapEntry(name, type);
+      }),
+    );
+  }
+
+  @override
+  FutureOr<TableScheme?> getTableSchemeImpl(
+    String table,
+    TableRelationshipReference? relationship, {
+    Object? contextID,
+  }) => executeWithPool((connection) {
+    var columns = _tableInfo(connection, table);
+    if (columns.isEmpty) return null;
+
+    var idFieldName = _findIDField(table, columns);
+
+    var fieldsTypes = _fieldsTypes(columns);
+
+    notifyTableFieldTypes(table, fieldsTypes);
+
+    var fieldsReferencedTablesRet = _findFieldsReferencedTables(
+      connection,
+      table,
+      contextID: contextID,
+    );
+
+    return fieldsReferencedTablesRet.resolveMapped((fieldsReferencedTables) {
+      var relationshipTablesRet = _findRelationshipTables(
+        connection,
+        table,
+        contextID: contextID,
+      );
+
+      return relationshipTablesRet.resolveMapped((relationshipTables) {
+        var tableScheme = TableScheme(
+          table,
+          relationship: relationship != null,
+          idFieldName: idFieldName,
+          fieldsTypes: fieldsTypes,
+          fieldsReferencedTables: fieldsReferencedTables,
+          relationshipTables: relationshipTables,
+        );
+
+        _log.info('$tableScheme');
+
+        return tableScheme;
+      });
+    });
+  });
+
+  String _findIDField(String table, List<Row> columns) {
+    var primaryFieldsNames = columns
+        .where((c) => (c['pk'] as int? ?? 0) > 0)
+        .sorted((a, b) => (a['pk'] as int).compareTo(b['pk'] as int))
+        .map((c) => c['name'].toString())
+        .toList();
+
+    return selectIDFieldName(table, primaryFieldsNames);
+  }
+
+  static final RegExp _regExpSpaces = RegExp(r'\s+');
+  static final RegExp _regExpIgnoreWords = RegExp(
+    r'unsigned|signed|varying|precision|native|\(.*?\)',
+  );
+
+  Type _toFieldType(String dataType) {
+    dataType = dataType.toLowerCase();
+    dataType = dataType.replaceAll(_regExpIgnoreWords, ' ');
+    dataType = dataType.replaceAll(_regExpSpaces, ' ');
+    dataType = dataType.trim();
+
+    switch (dataType) {
+      case 'boolean':
+      case 'bool':
+        return bool;
+      case 'tinyint':
+      case 'smallint':
+      case 'mediumint':
+      case 'int':
+      case 'int2':
+      case 'int8':
+      case 'bigint':
+      case 'integer':
+        return int;
+      case 'decimal':
+      case 'numeric':
+        return Decimal;
+      case 'float':
+      case 'double':
+      case 'real':
+        return double;
+      case 'blob':
+        return Uint8List;
+      case 'time':
+        return Time;
+      case 'timestamp':
+      case 'date':
+      case 'datetime':
+        return DateTime;
+      case 'text':
+      case 'char':
+      case 'varchar':
+      case 'clob':
+      case 'enum':
+        return String;
+      default:
+        // SQLite keeps the declared type verbatim; fall back to its affinity
+        // rules (https://sqlite.org/datatype3.html#determination_of_column_affinity).
+        if (dataType.contains('int')) return int;
+        if (dataType.contains('char') ||
+            dataType.contains('clob') ||
+            dataType.contains('text')) {
+          return String;
+        }
+        if (dataType.contains('blob')) return Uint8List;
+        if (dataType.contains('real') ||
+            dataType.contains('floa') ||
+            dataType.contains('doub')) {
+          return double;
+        }
+        return String;
+    }
+  }
+
+  final Expando<FutureOr<List<String>>> _listTablesNamesContextCache =
+      Expando();
+
+  FutureOr<List<String>> _listTablesNames(
+    DBSQLiteConnectionWrapper connection, {
+    Object? contextID,
+  }) => _listTablesNamesContextCache.putIfAbsentAsync(
+    contextID,
+    () => _listTablesNamesImpl(connection),
+  );
+
+  List<String> _listTablesNamesImpl(DBSQLiteConnectionWrapper connection) {
+    var results = connection.select(
+      "SELECT name FROM sqlite_master "
+      "WHERE type = 'table' AND name NOT LIKE 'sqlite_%'",
+    );
+
+    return results.map((r) => r['name'].toString()).toList();
+  }
+
+  final TimedMap<String, Map<String, TableFieldReference>>
+  _findFieldsReferencedTablesCache =
+      TimedMap<String, Map<String, TableFieldReference>>(Duration(seconds: 30));
+
+  final Expando<Map<String, FutureOr<Map<String, TableFieldReference>>>>
+  _findFieldsReferencedTablesContextCache = Expando();
+
+  FutureOr<Map<String, TableFieldReference>> _findFieldsReferencedTables(
+    DBSQLiteConnectionWrapper connection,
+    String table, {
+    Object? contextID,
+  }) {
+    if (contextID != null) {
+      var cache = _findFieldsReferencedTablesContextCache[contextID] ??= {};
+      var cached = cache[table];
+      if (cached != null) return cached;
+
+      var ret = _findFieldsReferencedTablesImpl(connection, table);
+      cache[table] = ret;
+
+      return ret.resolveMapped((r) {
+        cache[table] = r;
+        _findFieldsReferencedTablesCache[table] = r;
+        return r;
+      });
+    }
+
+    return _findFieldsReferencedTablesCache.putIfAbsentCheckedAsync(
+      table,
+      () => _findFieldsReferencedTablesImpl(connection, table),
+    );
+  }
+
+  FutureOr<Map<String, TableFieldReference>> _findFieldsReferencedTablesImpl(
+    DBSQLiteConnectionWrapper connection,
+    String table,
+  ) {
+    var results = connection.select(
+      'SELECT * FROM pragma_foreign_key_list(?)',
+      [table],
+    );
+
+    var mapEntriesRet = results
+        .map<FutureOr<MapEntry<String, TableFieldReference>?>>((r) {
+          var sourceField = r['from']?.toString();
+          var targetTable = r['table']?.toString();
+          var targetField = r['to']?.toString();
+
+          if (sourceField == null || targetTable == null) {
+            return null as FutureOr<MapEntry<String, TableFieldReference>?>;
+          }
+
+          // `PRAGMA foreign_key_list` reports a `null` target column when
+          // the reference points at the target's PRIMARY KEY implicitly.
+          FutureOr<String?> targetFieldRet =
+              targetField ??
+              getTableScheme(targetTable).resolveMapped((s) => s?.idFieldName);
+
+          return targetFieldRet.resolveMapped<
+            MapEntry<String, TableFieldReference>?
+          >((targetField) {
+            if (targetField == null) return null;
+
+            var sourceFieldsTypesRet = getTableFieldsTypes(table);
+            var targetFieldsTypesRet = getTableFieldsTypes(targetTable);
+
+            return sourceFieldsTypesRet.resolveBoth(targetFieldsTypesRet, (
+              sourceFieldsTypes,
+              targetFieldsTypes,
+            ) {
+              var sourceFieldType = sourceFieldsTypes?[sourceField] ?? String;
+              var targetFieldType = targetFieldsTypes?[targetField] ?? String;
+
+              return MapEntry<String, TableFieldReference>(
+                sourceField,
+                TableFieldReference(
+                  table,
+                  sourceField,
+                  sourceFieldType,
+                  targetTable,
+                  targetField,
+                  targetFieldType,
+                ),
+              );
+            });
+          });
+        })
+        .toList()
+        .resolveAll();
+
+    return mapEntriesRet.resolveMapped(
+      (mapEntries) =>
+          Map<String, TableFieldReference>.fromEntries(mapEntries.nonNulls),
+    );
+  }
+
+  FutureOr<List<TableRelationshipReference>> _findRelationshipTables(
+    DBSQLiteConnectionWrapper connection,
+    String table, {
+    Object? contextID,
+  }) {
+    var tablesNamesRet = _listTablesNames(connection, contextID: contextID);
+
+    return tablesNamesRet.resolveMapped((tablesNames) {
+      var tablesReferencesRet = tablesNames
+          .map(
+            (t) => _findFieldsReferencedTables(
+              connection,
+              t,
+              contextID: contextID,
+            ),
+          )
+          .toList()
+          .resolveAll();
+
+      return tablesReferencesRet.resolveMapped((tablesReferences) {
+        var candidates = tablesReferences.where((m) {
+          return m.length > 1 &&
+              m.values.where((r) => r.targetTable == table).isNotEmpty &&
+              m.values.where((r) => r.targetTable != table).isNotEmpty;
+        }).toList();
+
+        return candidates
+            .map((e) {
+              var refToTables = e.values
+                  .where((r) => r.targetTable == table)
+                  .toList(growable: false);
+
+              var otherRefs = e.values
+                  .where((r) => r.targetTable != table)
+                  .toList(growable: false);
+
+              if (refToTables.length != 1 || otherRefs.length != 1) {
+                return null;
+              }
+
+              var refToTable = refToTables.first;
+              var otherRef = otherRefs.first;
+
+              return TableRelationshipReference(
+                refToTable.sourceTable,
+                refToTable.targetTable,
+                refToTable.targetField,
+                refToTable.targetFieldType,
+                refToTable.sourceField,
+                otherRef.targetTable,
+                otherRef.targetField,
+                otherRef.targetFieldType,
+                otherRef.sourceField,
+              );
+            })
+            .nonNulls
+            .toList();
+      });
+    });
+  }
+
+  // -------------------------------------------------------------------------
+  // Type mapping.
+  // -------------------------------------------------------------------------
+
+  // `typeToSQLType` and `foreignKeyTypeToSQLType` are deliberately NOT
+  // overridden. SQLite has no fixed set of type names — a declared type only
+  // selects a storage *affinity* — and every name the base `SQLGenerator`
+  // emits maps to the right one: `INT`/`BIGINT` -> INTEGER, `VARCHAR` -> TEXT,
+  // `BLOB` -> BLOB, `BOOLEAN`/`DECIMAL` -> NUMERIC, and `TIMESTAMP`/`TIME` ->
+  // NUMERIC, which keeps their non-numeric ISO-8601 text as TEXT.
+  //
+  // The one place a literal type name is load-bearing is the primary key:
+
+  @override
+  String? primaryKeyTypeToSQLType(
+    Type type, {
+    List<EntityField>? entityFieldAnnotations,
+  }) {
+    // SQLite has no `SERIAL`: an auto-incrementing primary key must be declared
+    // exactly as `INTEGER PRIMARY KEY [AUTOINCREMENT]`. Note that `SERIAL` is
+    // silently *accepted* by SQLite (unknown type names get NUMERIC affinity)
+    // but would leave the ID `NULL` on every insert.
+    if (type.isNumericOrDynamicNumberType) {
+      return 'INTEGER PRIMARY KEY AUTOINCREMENT';
+    }
+
+    return super.primaryKeyTypeToSQLType(
+      type,
+      entityFieldAnnotations: entityFieldAnnotations,
+    );
+  }
+
+  @override
+  MapEntry<String, List<String>>? enumTypeToSQLType(
+    Type type,
+    String column, {
+    List<EntityField>? entityFieldAnnotations,
+  }) {
+    var enumType = super.enumTypeToSQLType(
+      type,
+      column,
+      entityFieldAnnotations: entityFieldAnnotations,
+    );
+
+    if (enumType == null) return null;
+
+    // SQLite has no `ENUM` type: emulate it with a `CHECK` constraint.
+    var values = enumType.value;
+    return MapEntry(values.isEmpty ? 'VARCHAR' : 'VARCHAR CHECK', values);
+  }
+
+  // -------------------------------------------------------------------------
+  // Parameter binding.
+  //
+  // `sqlite3` only binds `int`, `double`, `String`, `List<int>` and `null`, so
+  // the richer values that reach an adapter need to be normalized here. This is
+  // the single choke point for every statement executed by this adapter.
+  // -------------------------------------------------------------------------
+
+  static List<Object?> _normalizeParameters(List<Object?>? values) {
+    if (values == null || values.isEmpty) return const <Object?>[];
+    return values.map(_normalizeParameter).toList(growable: false);
+  }
+
+  static Object? _normalizeParameter(Object? value) {
+    if (value == null || value is int || value is double || value is String) {
+      return value;
+    }
+
+    if (value is bool) return value ? 1 : 0;
+    if (value is Uint8List) return value;
+    if (value is DateTime) return value.toUtc().toIso8601String();
+    if (value is Time) return value.toString();
+    if (value is Enum) return value.name;
+    if (value is BigInt) {
+      return value.isValidInt ? value.toInt() : value.toString();
+    }
+    if (value is DynamicInt) {
+      var n = value.toBigInt();
+      return n.isValidInt ? n.toInt() : n.toString();
+    }
+    if (value is Decimal) return value.toDouble();
+    if (value is List<int>) return value;
+
+    return value.toString();
+  }
+
+  // -------------------------------------------------------------------------
+  // Statement execution.
+  // -------------------------------------------------------------------------
+
+  /// Runs [sql] on [connection], tagging any [SqliteException] with the [SQL]
+  /// that caused it so [resolveError] can name the offending value.
+  ResultSet _select(DBSQLiteConnectionWrapper connection, SQL sql) {
+    try {
+      return connection.select(
+        sql.sqlPositional,
+        sql.parametersValuesByPosition,
+      );
+    } on SqliteException catch (e, s) {
+      Error.throwWithStackTrace(_SQLiteStatementException(e, sql), s);
+    }
+  }
+
+  @override
+  FutureOr<bool> executeTableSQL(String createTableSQL) =>
+      executeWithPool((connection) {
+        try {
+          connection.execute(createTableSQL);
+          return true;
+        } catch (e, s) {
+          _log.severe("Error executing table SQL:\n$createTableSQL", e, s);
+          return false;
+        }
+      });
+
+  @override
+  FutureOr<int> doCountSQL(
+    String entityName,
+    String table,
+    SQL sql,
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection,
+  ) {
+    var results = _select(connection, sql);
+
+    var count = results.map((r) => r.values.firstOrNull).firstOrNull ?? 0;
+
+    return count is int ? count : int.tryParse(count.toString().trim()) ?? 0;
+  }
+
+  @override
+  FutureOr<List<I>> doExistIDsSQL<I extends Object>(
+    String entityName,
+    String table,
+    SQL sql,
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection,
+  ) {
+    if (sql.isDummy) return <I>[];
+
+    var results = _select(connection, sql);
+
+    return parseIDs<I>(results.map((r) => r['id']));
+  }
+
+  @override
+  FutureOr<Iterable<Map<String, dynamic>>> doSelectSQL(
+    String entityName,
+    String table,
+    SQL sql,
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection,
+  ) {
+    if (sql.isDummy) return <Map<String, dynamic>>[];
+
+    var results = _select(connection, sql);
+
+    return _resultsToEntitiesMaps(results);
+  }
+
+  /// `Row` is an unmodifiable `Map` view over the `ResultSet`: copy it, since
+  /// the framework mutates the returned entity maps.
+  static List<Map<String, dynamic>> _resultsToEntitiesMaps(ResultSet? results) {
+    if (results == null) return <Map<String, dynamic>>[];
+    return results.map((r) => Map<String, dynamic>.from(r)).toList();
+  }
+
+  @override
+  FutureOr<Iterable<Map<String, dynamic>>> doDeleteSQL(
+    String entityName,
+    String table,
+    SQL sql,
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection,
+  ) {
+    if (sql.isFullyDummy) return <Map<String, dynamic>>[];
+
+    var preSQLs = sql.preSQL;
+    if (preSQLs != null) {
+      for (var e in preSQLs) {
+        _select(connection, e);
+      }
+    }
+
+    ResultSet? results;
+    if (!sql.isDummy) {
+      results = _select(connection, sql);
+    }
+
+    var posSQLs = sql.posSQL;
+    if (posSQLs != null) {
+      var posResults = posSQLs.map((e) => _select(connection, e)).toList();
+
+      var idx = sql.posSQLReturnIndex;
+      if (idx != null) results = posResults[idx];
+    }
+
+    return _resultsToEntitiesMaps(results);
+  }
+
+  @override
+  FutureOr<dynamic> doInsertSQL(
+    String entityName,
+    String table,
+    SQL sql,
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection,
+  ) {
+    if (sql.isDummy) return null;
+
+    var results = _select(connection, sql);
+
+    return _resolveResultID(connection, results, sql);
+  }
+
+  @override
+  FutureOr doUpdateSQL(
+    String entityName,
+    String table,
+    SQL sql,
+    Object id,
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection, {
+    bool allowAutoInsert = false,
+  }) {
+    if (sql.isDummy) return id;
+
+    var results = _select(connection, sql);
+
+    var affectedRows = connection.updatedRows;
+
+    if (affectedRows == 0 && results.isEmpty) {
+      var entry = sql.parametersByPlaceholder;
+      if (!allowAutoInsert) {
+        throw StateError(
+          "Can't update not stored entity into table `$table`: $entry",
+        );
+      }
+
+      var fields = sql.namedParameters!;
+
+      return generateInsertSQL(
+        transaction,
+        entityName,
+        table,
+        fields,
+      ).resolveMapped((insertSQL) {
+        _log.info('Update not affecting any row! Auto inserting: $insertSQL');
+        return doInsertSQL(
+          entityName,
+          table,
+          insertSQL,
+          transaction,
+          connection,
+        );
+      });
+    }
+
+    return _resolveResultID(connection, results, sql, id);
+  }
+
+  dynamic _resolveResultID(
+    DBSQLiteConnectionWrapper connection,
+    ResultSet results,
+    SQL sql, [
+    Object? entityId,
+  ]) {
+    if (entityId != null) return entityId;
+
+    var returning = results.firstOrNull;
+
+    if (returning != null && returning.isNotEmpty) {
+      if (returning.length == 1) {
+        return returning.values.first;
+      }
+
+      var idFieldName = sql.idFieldName;
+      if (idFieldName != null) {
+        var id = returning[idFieldName];
+        if (id != null) return id;
+      }
+
+      return returning.values.first;
+    }
+
+    // No `RETURNING` row (e.g. a table with a non-`rowid` primary key):
+    var lastInsertRowId = connection.lastInsertRowId;
+    return lastInsertRowId != 0 ? lastInsertRowId : null;
+  }
+
+  @override
+  Object resolveError(
+    Object error,
+    StackTrace stackTrace,
+    Object? operation,
+    Object? previousError,
+  ) {
+    if (error is DBSQLiteAdapterException) {
+      return error;
+    }
+
+    SQL? failedSQL;
+    if (error is _SQLiteStatementException) {
+      failedSQL = error.sql;
+      error = error.error;
+    }
+
+    if (error is SqliteException) {
+      var extendedCode = error.extendedResultCode;
+
+      // SQLITE_CONSTRAINT_UNIQUE / SQLITE_CONSTRAINT_PRIMARYKEY:
+      if (extendedCode == 2067 || extendedCode == 1555) {
+        var (tableName, fieldName) = _parseConstraintTableField(error.message);
+
+        return EntityFieldInvalid(
+          "unique",
+          _invalidValue(failedSQL, fieldName, error),
+          tableName: tableName,
+          fieldName: fieldName,
+          parentError: error,
+          parentStackTrace: stackTrace,
+          previousError: previousError,
+          operation: operation,
+        );
+      }
+
+      // SQLITE_CONSTRAINT_FOREIGNKEY:
+      if (extendedCode == 787) {
+        return DBSQLiteAdapterException(
+          'delete.constraint',
+          error.message,
+          parentError: error,
+          parentStackTrace: stackTrace,
+          previousError: previousError,
+          operation: operation,
+        );
+      }
+
+      // SQLITE_CONSTRAINT_NOTNULL:
+      if (extendedCode == 1299) {
+        var (tableName, fieldName) = _parseConstraintTableField(error.message);
+
+        return EntityFieldInvalid(
+          "null",
+          _invalidValue(failedSQL, fieldName, error),
+          tableName: tableName,
+          fieldName: fieldName,
+          parentError: error,
+          parentStackTrace: stackTrace,
+          previousError: previousError,
+          operation: operation,
+        );
+      }
+
+      // SQLITE_CONSTRAINT_CHECK: a value outside an emulated `ENUM`.
+      // Note SQLite's CHECK message quotes the expression
+      // ("CHECK constraint failed: t IN ('a','b')"), not `table.column`, so
+      // `_parseConstraintTableField` yields nulls here.
+      if (extendedCode == 275) {
+        var (tableName, fieldName) = _parseConstraintTableField(error.message);
+
+        return EntityFieldInvalid(
+          "check",
+          error.message,
+          tableName: tableName,
+          fieldName: fieldName,
+          parentError: error,
+          parentStackTrace: stackTrace,
+          previousError: previousError,
+        );
+      }
+    }
+
+    return DBSQLiteAdapterException(
+      'error',
+      '$error',
+      parentError: error,
+      parentStackTrace: stackTrace,
+      previousError: previousError,
+      operation: operation,
+    );
+  }
+
+  /// SQLite constraint messages name the offending columns as
+  /// `UNIQUE constraint failed: table.column[, table.column]`.
+  static final RegExp _regExpConstraintField = RegExp(
+    r'constraint failed:\s*(\w+)\.(\w+)',
+    caseSensitive: false,
+  );
+
+  static (String?, String?) _parseConstraintTableField(String message) {
+    var match = _regExpConstraintField.firstMatch(message);
+    if (match == null) return (null, null);
+    return (match[1], match[2]);
+  }
+
+  /// The value that violated a constraint.
+  ///
+  /// Unlike PostgreSQL (`Key (email)=(joe@…) already exists`) and MySQL
+  /// (`Duplicate entry 'joe@…' for key …`), SQLite's message only names
+  /// `table.column`, so the value is recovered from the statement's bound
+  /// parameters (keyed by field name). Falls back to the driver message.
+  static Object? _invalidValue(
+    SQL? sql,
+    String? fieldName,
+    SqliteException error,
+  ) {
+    if (sql != null && fieldName != null) {
+      var parameters = sql.parametersByPlaceholder;
+      if (parameters.containsKey(fieldName)) return parameters[fieldName];
+    }
+    return error.message;
+  }
+
+  // -------------------------------------------------------------------------
+  // Transactions.
+  // -------------------------------------------------------------------------
+
+  @override
+  Future<DBSQLiteConnectionWrapper> openTransaction(Transaction transaction) {
+    var contextCompleter = Completer<DBSQLiteConnectionWrapper>();
+
+    var result = executeWithPool(
+      (connection) {
+        return connection.openTransaction((transactionWrap) {
+          contextCompleter.complete(transactionWrap);
+
+          return _runTransaction(transaction, connection);
+        });
+      },
+      validator: (c) => !transaction.isAborted,
+      onError: (e, s) => transaction.notifyExecutionError(
+        e,
+        s,
+        errorResolver: resolveError,
+        debugInfo: () => transaction.toString(withExecutedOperations: false),
+      ),
+    );
+
+    transaction.transactionResult = result;
+
+    return contextCompleter.future;
+  }
+
+  /// Unlike the PostgreSQL/MySQL drivers, SQLite has no `runTx` helper that
+  /// commits or rolls back around a callback, so the `COMMIT`/`ROLLBACK` is
+  /// driven by [_DBSQLiteConnectionWrapped.openTransaction] and this must let
+  /// the error escape to it.
+  ///
+  /// Note that [resolveTransactionResult] is what throws on an aborted
+  /// transaction (since [throwTransactionResultWithError] is `true`), so it has
+  /// to be inside the same `try` as [Transaction.transactionFuture] — a
+  /// `.then(onValue, onError:)` pair would not catch it.
+  Future<Object?> _runTransaction(
+    Transaction transaction,
+    DBSQLiteConnectionWrapper connection,
+  ) async {
+    var res = await transaction.transactionFuture;
+    return await resolveTransactionResult(res, transaction, connection);
+  }
+
+  @override
+  bool get cancelTransactionResultWithError => false;
+
+  @override
+  bool get throwTransactionResultWithError => true;
+
+  @override
+  bool cancelTransaction(
+    Transaction transaction,
+    DBSQLiteConnectionWrapper? connection,
+    Object? error,
+    StackTrace? stackTrace,
+  ) {
+    // The `ROLLBACK` is issued by `_DBSQLiteConnectionWrapped.openTransaction`
+    // when the transaction block throws.
+    return true;
+  }
+
+  @override
+  bool get callCloseTransactionRequired => false;
+
+  @override
+  FutureOr<void> closeTransaction(
+    Transaction transaction,
+    DBSQLiteConnectionWrapper? connection,
+  ) {}
+
+  @override
+  String toString() {
+    var closedStr = isClosed ? ', closed' : '';
+    var modeStr = inMemory ? 'memory' : databasePath;
+    return 'DBSQLiteAdapter#$instanceID{$modeStr$closedStr}';
+  }
+}
+
+/// A [DBSQLiteAdapter] connection wrapper.
+abstract class DBSQLiteConnectionWrapper extends DBConnectionWrapper<Database> {
+  DBSQLiteConnectionWrapper(super.nativeConnection);
+
+  /// Runs [sql] and returns its rows.
+  ResultSet select(String sql, [List<Object?>? parameters]);
+
+  /// Runs [sql] discarding any rows.
+  void execute(String sql, [List<Object?>? parameters]);
+
+  /// The `rowid` of the most recent successful insert.
+  int get lastInsertRowId;
+
+  /// The number of rows changed by the most recent statement.
+  int get updatedRows;
+
+  /// Runs [queryBlock] inside a SQL transaction.
+  Future openTransaction(
+    Future Function(DBSQLiteConnectionWrapper connectionTransaction) queryBlock,
+  );
+
+  bool _nativeClosed = false;
+
+  @override
+  bool isClosedImpl() => _nativeClosed;
+
+  /// Only marks this wrapper closed: the native [Database] is shared by every
+  /// wrapper and is owned (and disposed) by [DBSQLiteAdapter].
+  @override
+  void closeImpl() {
+    _nativeClosed = true;
+  }
+}
+
+class _DBSQLiteConnectionWrapped extends DBSQLiteConnectionWrapper {
+  final DBSQLiteAdapter _adapter;
+
+  _DBSQLiteConnectionWrapped(super.nativeConnection, this._adapter);
+
+  @override
+  String get connectionURL => 'sqlite://${_adapter.databasePath}';
+
+  @override
+  ResultSet select(String sql, [List<Object?>? parameters]) {
+    updateLastAccessTime();
+    return nativeConnection.select(
+      sql,
+      DBSQLiteAdapter._normalizeParameters(parameters),
+    );
+  }
+
+  @override
+  void execute(String sql, [List<Object?>? parameters]) {
+    updateLastAccessTime();
+    nativeConnection.execute(
+      sql,
+      DBSQLiteAdapter._normalizeParameters(parameters),
+    );
+  }
+
+  @override
+  int get lastInsertRowId => nativeConnection.lastInsertRowId;
+
+  @override
+  int get updatedRows => nativeConnection.updatedRows;
+
+  static int _savePointCount = 0;
+
+  @override
+  Future openTransaction(
+    Future Function(DBSQLiteConnectionWrapper connectionTransaction) queryBlock,
+  ) async {
+    updateLastAccessTime();
+
+    // Every wrapper shares one native handle, so a plain `BEGIN` issued while
+    // another transaction is already open would fail with "cannot start a
+    // transaction within a transaction". `SAVEPOINT` nests, so use it whenever
+    // the handle is already in a transaction (`autocommit` is `false`).
+    var nested = !nativeConnection.autocommit;
+    var savePoint = nested ? 'bones_api_sp_${++_savePointCount}' : null;
+
+    if (savePoint != null) {
+      nativeConnection.execute('SAVEPOINT "$savePoint"');
+    } else {
+      // `IMMEDIATE` takes the write lock upfront: a deferred transaction would
+      // only try to upgrade on its first write, which can fail mid-transaction
+      // when another *process* holds the database file.
+      nativeConnection.execute(_adapter.inMemory ? 'BEGIN' : 'BEGIN IMMEDIATE');
+    }
+
+    try {
+      var result = await queryBlock(_DBSQLiteConnectionTransaction(this));
+
+      nativeConnection.execute(
+        savePoint != null ? 'RELEASE "$savePoint"' : 'COMMIT',
+      );
+
+      return result;
+    } catch (_) {
+      try {
+        if (savePoint != null) {
+          nativeConnection
+            ..execute('ROLLBACK TO "$savePoint"')
+            ..execute('RELEASE "$savePoint"');
+        } else {
+          nativeConnection.execute('ROLLBACK');
+        }
+      } catch (_) {}
+      rethrow;
+    }
+  }
+
+  @override
+  String get info => 'db: ${_adapter.databasePath}, closed: $isClosed';
+
+  @override
+  String get runtimeTypeNameSafe => '_DBSQLiteConnectionWrapped';
+}
+
+class _DBSQLiteConnectionTransaction extends DBSQLiteConnectionWrapper {
+  final _DBSQLiteConnectionWrapped parent;
+
+  _DBSQLiteConnectionTransaction(this.parent) : super(parent.nativeConnection);
+
+  @override
+  String get connectionURL => parent.connectionURL;
+
+  @override
+  ResultSet select(String sql, [List<Object?>? parameters]) =>
+      parent.select(sql, parameters);
+
+  @override
+  void execute(String sql, [List<Object?>? parameters]) =>
+      parent.execute(sql, parameters);
+
+  @override
+  int get lastInsertRowId => parent.lastInsertRowId;
+
+  @override
+  int get updatedRows => parent.updatedRows;
+
+  // SQLite has no nested transactions: re-enter the current one (same as the
+  // MySQL adapter).
+  @override
+  Future openTransaction(
+    Future Function(DBSQLiteConnectionWrapper connectionTransaction) queryBlock,
+  ) => queryBlock(this);
+
+  @override
+  String get runtimeTypeNameSafe => '_DBSQLiteConnectionTransaction';
+}
+
+/// Pairs a [SqliteException] with the [SQL] that caused it.
+///
+/// SQLite's constraint messages only name `table.column`, so
+/// [DBSQLiteAdapter.resolveError] needs the statement's bound parameters to
+/// report *which value* was rejected.
+class _SQLiteStatementException implements Exception {
+  final SqliteException error;
+  final SQL sql;
+
+  _SQLiteStatementException(this.error, this.sql);
+
+  @override
+  String toString() => '$error\nCausing SQL: $sql';
+}
+
+/// Exception thrown by [DBSQLiteAdapter] operations.
+class DBSQLiteAdapterException extends DBSQLAdapterException {
+  @override
+  String get runtimeTypeNameSafe => 'DBSQLiteAdapterException';
+
+  DBSQLiteAdapterException(
+    super.type,
+    super.message, {
+    super.parentError,
+    super.parentStackTrace,
+    super.operation,
+    super.previousError,
+  });
+}
diff --git a/lib/src/bones_api_entity_reference.dart b/lib/src/bones_api_entity_reference.dart
index e0dc6cc8..432c103c 100644
--- a/lib/src/bones_api_entity_reference.dart
+++ b/lib/src/bones_api_entity_reference.dart
@@ -78,15 +78,13 @@ class EntityInstantiatorHandler<T> extends EntityInstantiator<T> {
   }
 
   static Map<String, dynamic> resolveEntityMap(Object entity) {
-    var entityMap =
-        entity is Map
-            ? entity
-            : TypeParser.parseMap(entity) ?? <String, dynamic>{};
+    var entityMap = entity is Map
+        ? entity
+        : TypeParser.parseMap(entity) ?? <String, dynamic>{};
 
-    var entityMapCast =
-        entityMap is Map<String, dynamic>
-            ? entityMap
-            : entityMap.map((key, value) => MapEntry('$key', value));
+    var entityMapCast = entityMap is Map<String, dynamic>
+        ? entityMap
+        : entityMap.map((key, value) => MapEntry('$key', value));
 
     return entityMapCast;
   }
@@ -747,15 +745,13 @@ class EntityReference<T> extends EntityReferenceBase<T> {
   }
 
   static Map<String, dynamic> _resolveEntityMap(Object entity) {
-    var entityMap =
-        entity is Map
-            ? entity
-            : TypeParser.parseMap(entity) ?? <String, dynamic>{};
-
-    var entityMapCast =
-        entityMap is Map<String, dynamic>
-            ? entityMap
-            : entityMap.map((key, value) => MapEntry('$key', value));
+    var entityMap = entity is Map
+        ? entity
+        : TypeParser.parseMap(entity) ?? <String, dynamic>{};
+
+    var entityMapCast = entityMap is Map<String, dynamic>
+        ? entityMap
+        : entityMap.map((key, value) => MapEntry('$key', value));
     return entityMapCast;
   }
 
@@ -1052,8 +1048,8 @@ class EntityReference<T> extends EntityReferenceBase<T> {
       var entityProvider = this.entityProvider;
       if (entityProvider != null) {
         var entityByID =
-        // ignore: discarded_futures
-        entityProvider.getEntityByID<T>(id, type: type, sync: true);
+            // ignore: discarded_futures
+            entityProvider.getEntityByID<T>(id, type: type, sync: true);
         if (entityByID is Future) {
           throw StateError(
             "Can't get entity (#$id@`$T`) from `entityProvider`, returned a `Future`: $entityProvider",
@@ -1394,14 +1390,10 @@ class EntityReference<T> extends EntityReferenceBase<T> {
 
     var entityFetcher = _entityFetcher;
     if (entityFetcher != null) {
-      fetcher =
-          (ids, type) =>
-              ids
-                  .map(
-                    (id) => entityFetcher(id, type),
-                  ) // ignore: discarded_futures
-                  .toList()
-                  .resolveAll(); // ignore: discarded_futures
+      fetcher = (ids, type) => ids
+          .map((id) => entityFetcher(id, type)) // ignore: discarded_futures
+          .toList()
+          .resolveAll(); // ignore: discarded_futures
     }
 
     return EntityReferenceList<T>._(
@@ -1624,17 +1616,16 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
       var entities = json['entities'];
 
       if (entities != null && entities is List) {
-        var entitiesMaps =
-            entities is List<Map<String, dynamic>?>
-                ? entities
-                : entities
-                    .map((e) {
-                      var m = e is Map ? e : TypeParser.parseMap(e);
-                      return m is Map<String, dynamic>
-                          ? m
-                          : m?.map((key, value) => MapEntry('$key', value));
-                    })
-                    .toList(growable: false);
+        var entitiesMaps = entities is List<Map<String, dynamic>?>
+            ? entities
+            : entities
+                  .map((e) {
+                    var m = e is Map ? e : TypeParser.parseMap(e);
+                    return m is Map<String, dynamic>
+                        ? m
+                        : m?.map((key, value) => MapEntry('$key', value));
+                  })
+                  .toList(growable: false);
 
         return EntityReferenceList<T>.fromEntitiesMaps(
           entitiesMaps,
@@ -1819,26 +1810,20 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
       var entityHandler = this.entityHandler;
 
       if (entityHandler != null) {
-        _ids =
-            entitiesMaps
-                .map(
-                  (map) =>
-                      map == null ? null : entityHandler.resolveIDFromMap(map),
-                )
-                .toList();
+        _ids = entitiesMaps
+            .map(
+              (map) => map == null ? null : entityHandler.resolveIDFromMap(map),
+            )
+            .toList();
 
         entityCache ??= JsonEntityCacheSimple();
 
         List<FutureOr<T?>> lAsync = entitiesMaps
             .map(
-              (map) =>
-                  map == null
-                      ? null
-                      // ignore: discarded_futures
-                      : entityHandler.createFromMap(
-                        map,
-                        entityCache: entityCache,
-                      ),
+              (map) => map == null
+                  ? null
+                  // ignore: discarded_futures
+                  : entityHandler.createFromMap(map, entityCache: entityCache),
             )
             .toList(growable: false);
 
@@ -2092,18 +2077,17 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
       var entityProvider = this.entityProvider;
 
       if (ids != null && entityProvider != null) {
-        entities =
-            ids.map((id) {
-              var entityByID =
+        entities = ids.map((id) {
+          var entityByID =
               // ignore: discarded_futures
               entityProvider.getEntityByID<T>(id, type: type, sync: true);
-              if (entityByID is Future) {
-                throw StateError(
-                  "Can't get entity (#$id@`$T`) from `entityProvider`, returned a `Future`: $entityProvider",
-                );
-              }
-              return entityByID;
-            }).toList();
+          if (entityByID is Future) {
+            throw StateError(
+              "Can't get entity (#$id@`$T`) from `entityProvider`, returned a `Future`: $entityProvider",
+            );
+          }
+          return entityByID;
+        }).toList();
 
         if (entities.every((e) => e == null)) {
           entities = null;
@@ -2175,30 +2159,26 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
     if (entities == null) return null;
 
     if (jsonEncoder != null) {
-      var jsonList =
-          entities
-              .map(
-                (e) =>
-                    e == null
-                        ? null
-                        : (jsonEncoder.toJson(e) as Map<String, dynamic>?),
-              )
-              .toList();
+      var jsonList = entities
+          .map(
+            (e) => e == null
+                ? null
+                : (jsonEncoder.toJson(e) as Map<String, dynamic>?),
+          )
+          .toList();
       return jsonList;
     }
 
     var entityHandler = this.entityHandler;
 
     if (entityHandler != null) {
-      var jsonList =
-          entities
-              .map(
-                (e) =>
-                    e == null
-                        ? null
-                        : (entityHandler.toJson(e) as Map<String, dynamic>?),
-              )
-              .toList();
+      var jsonList = entities
+          .map(
+            (e) => e == null
+                ? null
+                : (entityHandler.toJson(e) as Map<String, dynamic>?),
+          )
+          .toList();
       return jsonList;
     }
 
@@ -2403,11 +2383,10 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
 
     if (entityProvider == null) return entities;
 
-    var l =
-        ids
-            .map((id) => entityProvider.getEntityByID<T>(id, type: type))
-            .toList()
-            .resolveAll();
+    var l = ids
+        .map((id) => entityProvider.getEntityByID<T>(id, type: type))
+        .toList()
+        .resolveAll();
 
     return l;
   }
@@ -2481,8 +2460,11 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
       if (ids.length == 1) {
         _entities = <T?>[o];
       } else {
-        var entities =
-            _entities = List<T?>.filled(ids.length, null, growable: true);
+        var entities = _entities = List<T?>.filled(
+          ids.length,
+          null,
+          growable: true,
+        );
 
         entities[ids.lastIndex] = o;
       }
@@ -2643,10 +2625,9 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
       var entityHandler = this.entityHandler;
 
       if (entityHandler != null) {
-        var otherIDs =
-            otherEntities
-                .map((e) => _getEntityIDImpl(entityHandler, e as T))
-                .toList();
+        var otherIDs = otherEntities
+            .map((e) => _getEntityIDImpl(entityHandler, e as T))
+            .toList();
         return _idsEquality.equals(ids, otherIDs);
       }
 
@@ -2708,8 +2689,7 @@ class EntityReferenceList<T> extends EntityReferenceBase<T> {
 
     final entitiesFetcher = _entitiesFetcher;
     if (entitiesFetcher != null) {
-      fetcher =
-          (id, type) =>
+      fetcher = (id, type) =>
           // ignore: discarded_futures
           entitiesFetcher([id], type).resolveMapped((l) => l?.firstOrNull);
     }
diff --git a/lib/src/bones_api_entity_rules.dart b/lib/src/bones_api_entity_rules.dart
index b804bbc3..1b8777c4 100644
--- a/lib/src/bones_api_entity_rules.dart
+++ b/lib/src/bones_api_entity_rules.dart
@@ -558,13 +558,13 @@ class EntityAccessRules extends EntityRules<EntityAccessRules> {
     return s._isInnocuousImpl()
         ? EntityAccessRules.innocuous
         : EntityAccessRules._simplified(
-          s.ruleType,
-          s.entityType,
-          s.entityFields,
-          s.rules,
-          s.condition,
-          s.masker,
-        );
+            s.ruleType,
+            s.entityType,
+            s.entityFields,
+            s.rules,
+            s.condition,
+            s.masker,
+          );
   }
 
   EntityAccessRules _simplifiedImpl() {
@@ -575,13 +575,12 @@ class EntityAccessRules extends EntityRules<EntityAccessRules> {
         .where((r) => !r.isInnocuous)
         .map((r) => r.simplified());
 
-    var rulesSimpleFlat =
-        rulesSimple.expand((r) {
-          var rules = r.rules;
-          return rules != null && rules.isNotEmpty && r.entityType == null
-              ? rules
-              : [r];
-        }).toList();
+    var rulesSimpleFlat = rulesSimple.expand((r) {
+      var rules = r.rules;
+      return rules != null && rules.isNotEmpty && r.entityType == null
+          ? rules
+          : [r];
+    }).toList();
 
     if (entityType != null) {
       var r1 = copyWith(rules: []);
@@ -614,15 +613,13 @@ class EntityAccessRules extends EntityRules<EntityAccessRules> {
     var rulesA = a.rules;
     var rulesB = b.rules;
 
-    var listA =
-        rulesA != null && rulesA.isNotEmpty && a.entityType == null
-            ? rulesA
-            : [a];
+    var listA = rulesA != null && rulesA.isNotEmpty && a.entityType == null
+        ? rulesA
+        : [a];
 
-    var listB =
-        rulesB != null && rulesB.isNotEmpty && b.entityType == null
-            ? rulesB
-            : [b];
+    var listB = rulesB != null && rulesB.isNotEmpty && b.entityType == null
+        ? rulesB
+        : [b];
 
     var allRules = [...listA, ...listB];
 
@@ -671,26 +668,24 @@ class EntityAccessRules extends EntityRules<EntityAccessRules> {
     var propsStr = props.isNotEmpty ? '{${props.join(', ')}}' : '';
 
     final rules = this.rules;
-    var rulesStr =
-        rules != null && rules.isNotEmpty
-            ? '<\n  ${rules.join('\n  ')}\n>'
-            : '';
+    var rulesStr = rules != null && rules.isNotEmpty
+        ? '<\n  ${rules.join('\n  ')}\n>'
+        : '';
 
     return 'EntityAccessRules$ruleTypeStr$propsStr$rulesStr';
   }
 
   @override
-  Map<String, Object?> toJson() =>
-      isInnocuous
-          ? <String, Object?>{}
-          : <String, Object?>{
-            if (ruleType != null) 'ruleType': ruleType?.name,
-            if (entityType != null) 'entityType': '$entityType',
-            if (entityFields != null && entityFields!.isNotEmpty)
-              'entityFields': entityFields,
-            if (rules != null && rules!.isNotEmpty)
-              'rules': rules!.map((e) => e.toJson()).toList(),
-          };
+  Map<String, Object?> toJson() => isInnocuous
+      ? <String, Object?>{}
+      : <String, Object?>{
+          if (ruleType != null) 'ruleType': ruleType?.name,
+          if (entityType != null) 'entityType': '$entityType',
+          if (entityFields != null && entityFields!.isNotEmpty)
+            'entityFields': entityFields,
+          if (rules != null && rules!.isNotEmpty)
+            'rules': rules!.map((e) => e.toJson()).toList(),
+        };
 
   ToEncodableJson? toJsonEncodable(
     APIRequest apiRequest,
@@ -1218,17 +1213,15 @@ class EntityResolutionRules extends EntityRules<EntityResolutionRules> {
     Map<Object, bool?>? lazyTypes,
     bool mergeTolerant = false,
   }) {
-    var eagerTypesNotNull =
-        eagerTypes?.entries.map((e) {
-          var eager = e.value;
-          return eager != null ? MapEntry(e.key, eager) : null;
-        }).nonNulls;
-
-    var lazyTypesNotNull =
-        lazyTypes?.entries.map((e) {
-          var lazy = e.value;
-          return lazy != null ? MapEntry(e.key, lazy) : null;
-        }).nonNulls;
+    var eagerTypesNotNull = eagerTypes?.entries.map((e) {
+      var eager = e.value;
+      return eager != null ? MapEntry(e.key, eager) : null;
+    }).nonNulls;
+
+    var lazyTypesNotNull = lazyTypes?.entries.map((e) {
+      var lazy = e.value;
+      return lazy != null ? MapEntry(e.key, lazy) : null;
+    }).nonNulls;
 
     var fetchEager = eagerTypesNotNull?.map((e) {
       var t = e.key;
@@ -1254,33 +1247,31 @@ class EntityResolutionRules extends EntityRules<EntityResolutionRules> {
       return !lazy ? t : null;
     });
 
-    var eagerEntityTypes =
-        [...?fetchEager, ...?fetchNotLazy].nonNulls
-            .expand((e) => e is Iterable ? e : [e])
-            .whereType<Type>()
-            .toList();
+    var eagerEntityTypes = [...?fetchEager, ...?fetchNotLazy].nonNulls
+        .expand((e) => e is Iterable ? e : [e])
+        .whereType<Type>()
+        .toList();
 
-    var lazyEntityTypes =
-        [...?fetchLazy, ...?fetchNotEager].nonNulls
-            .expand((e) => e is Iterable ? e : [e])
-            .whereType<Type>()
-            .toList();
+    var lazyEntityTypes = [...?fetchLazy, ...?fetchNotEager].nonNulls
+        .expand((e) => e is Iterable ? e : [e])
+        .whereType<Type>()
+        .toList();
 
     if (allEager != null && allEager) {
       return lazyEntityTypes.isNotEmpty
           ? EntityResolutionRules(
-            allEager: true,
-            lazyEntityTypes: lazyEntityTypes,
-            mergeTolerant: mergeTolerant,
-          )
+              allEager: true,
+              lazyEntityTypes: lazyEntityTypes,
+              mergeTolerant: mergeTolerant,
+            )
           : EntityResolutionRules.fetchEagerAll(mergeTolerant: mergeTolerant);
     } else if (allLazy != null && allLazy) {
       return eagerEntityTypes.isNotEmpty
           ? EntityResolutionRules(
-            allLazy: true,
-            eagerEntityTypes: eagerEntityTypes,
-            mergeTolerant: mergeTolerant,
-          )
+              allLazy: true,
+              eagerEntityTypes: eagerEntityTypes,
+              mergeTolerant: mergeTolerant,
+            )
           : EntityResolutionRules.fetchLazyAll(mergeTolerant: mergeTolerant);
     }
 
@@ -1340,8 +1331,9 @@ class EntityResolutionRules extends EntityRules<EntityResolutionRules> {
         eagerEntityTypes.isNotEmpty &&
         lazyEntityTypes.isNotEmpty) {
       if (eagerEntityTypes.any((t) => lazyEntityTypes.contains(t))) {
-        var conflict =
-            eagerEntityTypes.where((t) => lazyEntityTypes.contains(t)).toList();
+        var conflict = eagerEntityTypes
+            .where((t) => lazyEntityTypes.contains(t))
+            .toList();
         return conflict;
       }
     }
@@ -1508,11 +1500,13 @@ class EntityResolutionRules extends EntityRules<EntityResolutionRules> {
       }
     }
 
-    var lazyEntityTypes =
-        this.lazyEntityTypes.merge(other.lazyEntityTypes).nullIfEmpty();
+    var lazyEntityTypes = this.lazyEntityTypes
+        .merge(other.lazyEntityTypes)
+        .nullIfEmpty();
 
-    var eagerEntityTypes =
-        this.eagerEntityTypes.merge(other.eagerEntityTypes).nullIfEmpty();
+    var eagerEntityTypes = this.eagerEntityTypes
+        .merge(other.eagerEntityTypes)
+        .nullIfEmpty();
 
     var merge = EntityResolutionRules(
       allowEntityFetch: allowEntityFetch,
@@ -1602,25 +1596,26 @@ class EntityResolutionRules extends EntityRules<EntityResolutionRules> {
     return isInnocuous
         ? 'EntityResolutionRules{innocuous}'
         : 'EntityResolutionRules{${[if (allLazy != null) 'allLazy: $allLazy', if (allEager != null) 'allEager: $allEager', if (allowEntityFetch) 'allowEntityFetch', if (allowReadFile) 'allowReadFile', if (lazyEntityTypes != null && lazyEntityTypes.isNotEmpty) 'lazyEntityTypes: $lazyEntityTypes', if (eagerEntityTypes != null && eagerEntityTypes.isNotEmpty) 'eagerEntityTypes: $eagerEntityTypes'].join(', ')}'
-            '}';
+              '}';
   }
 
   @override
-  Map<String, Object?> toJson() =>
-      isInnocuous
-          ? <String, Object?>{}
-          : <String, Object?>{
-            if (allLazy != null) 'allLazy': allLazy,
-            if (allEager != null) 'allEager': allEager,
-            if (allowEntityFetch) 'allowEntityFetch': true,
-            if (allowReadFile) 'allowReadFile': true,
-            if (lazyEntityTypes != null && lazyEntityTypes!.isNotEmpty)
-              'lazyEntityTypes':
-                  lazyEntityTypes!.map((e) => e.toString()).toList(),
-            if (eagerEntityTypes != null && eagerEntityTypes!.isNotEmpty)
-              'eagerEntityTypes':
-                  eagerEntityTypes!.map((e) => e.toString()).toList(),
-          };
+  Map<String, Object?> toJson() => isInnocuous
+      ? <String, Object?>{}
+      : <String, Object?>{
+          if (allLazy != null) 'allLazy': allLazy,
+          if (allEager != null) 'allEager': allEager,
+          if (allowEntityFetch) 'allowEntityFetch': true,
+          if (allowReadFile) 'allowReadFile': true,
+          if (lazyEntityTypes != null && lazyEntityTypes!.isNotEmpty)
+            'lazyEntityTypes': lazyEntityTypes!
+                .map((e) => e.toString())
+                .toList(),
+          if (eagerEntityTypes != null && eagerEntityTypes!.isNotEmpty)
+            'eagerEntityTypes': eagerEntityTypes!
+                .map((e) => e.toString())
+                .toList(),
+        };
 }
 
 class EntityResolutionRulesResolved implements EntityResolutionRules {
@@ -1880,9 +1875,8 @@ mixin EntityRulesResolver {
 
   static EntityRulesContextProvider? _singleContextProvider;
 
-  static void _updateSingleContextProvider() =>
-      _singleContextProvider =
-          _cotextProviders.length == 1 ? _cotextProviders.first : null;
+  static void _updateSingleContextProvider() => _singleContextProvider =
+      _cotextProviders.length == 1 ? _cotextProviders.first : null;
 
   /// Returns the current [EntityRulesContextProvider]s.
   static List<EntityRulesContextProvider> get cotextProviders =>
@@ -2010,10 +2004,10 @@ mixin EntityRulesResolver {
       return identical(merge, EntityResolutionRules.innocuous)
           ? EntityResolutionRulesResolved._innocuousResolved
           : EntityResolutionRulesResolved(
-            merge,
-            contextRules: context,
-            rules: rules,
-          );
+              merge,
+              contextRules: context,
+              rules: rules,
+            );
     }
   }
 }
diff --git a/lib/src/bones_api_error_zone.dart b/lib/src/bones_api_error_zone.dart
index 9952e04b..1baf7613 100644
--- a/lib/src/bones_api_error_zone.dart
+++ b/lib/src/bones_api_error_zone.dart
@@ -26,8 +26,8 @@ Zone createErrorZone({
   var zoneId = ++_errorZoneIDCount;
 
   var zoneSpecification = ZoneSpecification(
-    handleUncaughtError:
-        (self, parent, zone, error, stackTrace) => _handleUncaughtError(
+    handleUncaughtError: (self, parent, zone, error, stackTrace) =>
+        _handleUncaughtError(
           uncaughtErrorTitle,
           printErrorToStderr,
           onUncaughtError,
@@ -213,9 +213,8 @@ class ZoneField<T extends Object> {
       }
 
       zoneSpecification = ZoneSpecification(
-        handleUncaughtError:
-            (self, parent, zone, error, stack) =>
-                handleUncaughtError(error, stack),
+        handleUncaughtError: (self, parent, zone, error, stack) =>
+            handleUncaughtError(error, stack),
       );
     }
 
diff --git a/lib/src/bones_api_extension.dart b/lib/src/bones_api_extension.dart
index 16de9706..dffc1b35 100644
--- a/lib/src/bones_api_extension.dart
+++ b/lib/src/bones_api_extension.dart
@@ -578,10 +578,9 @@ extension TypeReflectionEntityExtension<T> on TypeReflection<T> {
       isListEntity ? EntityHandler.isValidEntityType(arguments0!.type) : false;
 
   /// Returns `true` if [isListEntityOrReference] AND [EntityHandler.isValidEntityType] for the entity type ([argumentType] `0`).
-  bool get isValidListEntityOrReferenceType =>
-      isListEntityOrReference
-          ? EntityHandler.isValidEntityType(arguments0!.type)
-          : false;
+  bool get isValidListEntityOrReferenceType => isListEntityOrReference
+      ? EntityHandler.isValidEntityType(arguments0!.type)
+      : false;
 
   /// Returns `true` if [type] is equals to [EntityReference].
   bool get isEntityReferenceType => type == EntityReference;
@@ -630,10 +629,9 @@ extension TypeInfoEntityExtension<T> on TypeInfo<T> {
       isListEntity ? EntityHandler.isValidEntityType(arguments0!.type) : false;
 
   /// Returns `true` if [isListEntityOrReference] AND [EntityHandler.isValidEntityType] for the entity type ([argumentType] `0`).
-  bool get isValidListEntityOrReferenceType =>
-      isListEntityOrReference
-          ? EntityHandler.isValidEntityType(arguments0!.type)
-          : false;
+  bool get isValidListEntityOrReferenceType => isListEntityOrReference
+      ? EntityHandler.isValidEntityType(arguments0!.type)
+      : false;
 
   /// Returns `true` if [type] is equals to [EntityReference].
   bool get isEntityReferenceType => type == EntityReference;
@@ -822,10 +820,9 @@ extension TypeInfoEntityExtension<T> on TypeInfo<T> {
     EntityReference<E> castCall<E>() {
       EntityHandler<E>? oEntityHandler;
       if (entityHandler != null) {
-        oEntityHandler =
-            entityHandler is EntityHandler<E>
-                ? (entityHandler as EntityHandler<E>)
-                : entityHandler.getEntityHandler<E>(type: type);
+        oEntityHandler = entityHandler is EntityHandler<E>
+            ? (entityHandler as EntityHandler<E>)
+            : entityHandler.getEntityHandler<E>(type: type);
       }
 
       return _toEntityReferenceImpl<E>(
@@ -954,23 +951,20 @@ extension TypeInfoEntityExtension<T> on TypeInfo<T> {
     }
 
     if (entityFetcher != null && entitiesFetcher == null) {
-      entitiesFetcher =
-          (ids, type) =>
-              ids
-                  // ignore: discarded_futures
-                  .map((id) => id == null ? null : entityFetcher(id, type))
-                  .toList()
-                  // ignore: discarded_futures
-                  .resolveAll();
+      entitiesFetcher = (ids, type) => ids
+          // ignore: discarded_futures
+          .map((id) => id == null ? null : entityFetcher(id, type))
+          .toList()
+          // ignore: discarded_futures
+          .resolveAll();
     }
 
     EntityReferenceList<E> castCall<E>() {
       EntityHandler<E>? oEntityHandler;
       if (entityHandler != null) {
-        oEntityHandler =
-            entityHandler is EntityHandler<E>
-                ? (entityHandler as EntityHandler<E>)
-                : entityHandler.getEntityHandler<E>(type: type);
+        oEntityHandler = entityHandler is EntityHandler<E>
+            ? (entityHandler as EntityHandler<E>)
+            : entityHandler.getEntityHandler<E>(type: type);
       }
 
       return _toEntityReferenceListImpl<E>(
@@ -1038,10 +1032,9 @@ extension TypeInfoEntityExtension<T> on TypeInfo<T> {
         );
       } else if (o is List<Map<String, dynamic>?> ||
           o.every((Object? e) => e == null || e is Map<String, Object?>)) {
-        var entitiesMaps =
-            o is List<Map<String, dynamic>?>
-                ? o
-                : o.cast<Map<String, dynamic>?>();
+        var entitiesMaps = o is List<Map<String, dynamic>?>
+            ? o
+            : o.cast<Map<String, dynamic>?>();
         return EntityReferenceList<E>.fromEntitiesMaps(
           entitiesMaps,
           type: type,
diff --git a/lib/src/bones_api_html_document.dart b/lib/src/bones_api_html_document.dart
index afbb653c..fa1a6835 100644
--- a/lib/src/bones_api_html_document.dart
+++ b/lib/src/bones_api_html_document.dart
@@ -142,10 +142,11 @@ class HTMLDocument {
   }
 
   String get bodyStyles {
-    var styles = (_bodyStyles != null && _bodyStyles.trim().isNotEmpty
-            ? _bodyStyles
-            : '')
-        .split(RegExp(r'\s*;\s*'));
+    var styles =
+        (_bodyStyles != null && _bodyStyles.trim().isNotEmpty
+                ? _bodyStyles
+                : '')
+            .split(RegExp(r'\s*;\s*'));
 
     final bodyColor = this.bodyColor;
     if (bodyColor != null && bodyColor.isNotEmpty) {
@@ -402,17 +403,16 @@ class HTMLInput {
 
         html.write('<option value=""></option>\n');
 
-        valStr =
-            value != null
-                ? (enumReflection.name(value) ??
-                    value.toString().split('.').last)
-                : '';
+        valStr = value != null
+            ? (enumReflection.name(value) ?? value.toString().split('.').last)
+            : '';
 
         for (var e in enumReflection.values) {
           var enumName = enumReflection.name(e) ?? '';
 
-          var selected =
-              equalsIgnoreAsciiCase(enumName, valStr) ? ' selected' : '';
+          var selected = equalsIgnoreAsciiCase(enumName, valStr)
+              ? ' selected'
+              : '';
 
           html.write('<option value="$enumName"$selected>$enumName</option>\n');
         }
diff --git a/lib/src/bones_api_initializable.dart b/lib/src/bones_api_initializable.dart
index b6dd44fb..d5e47a40 100644
--- a/lib/src/bones_api_initializable.dart
+++ b/lib/src/bones_api_initializable.dart
@@ -158,10 +158,9 @@ class InitializationResult {
 
   @override
   String toString() {
-    var depsStr =
-        dependencies.isNotEmpty
-            ? '->${dependencies.length <= 3 ? dependencies.toInitializationStatus() : dependencies.length}'
-            : '';
+    var depsStr = dependencies.isNotEmpty
+        ? '->${dependencies.length <= 3 ? dependencies.toInitializationStatus() : dependencies.length}'
+        : '';
 
     if (ok) {
       return '[OK]@${initializable.initializationStatus}$depsStr';
@@ -370,8 +369,8 @@ class _InitializationChain {
   bool _markInitializedDependency(Initializable dependency) {
     _checkDependency(dependency);
 
-    var initializedDependencies =
-        _initializedDependencies ??= <Initializable>[];
+    var initializedDependencies = _initializedDependencies ??=
+        <Initializable>[];
     return initializedDependencies.addUnique(dependency);
   }
 
@@ -507,13 +506,14 @@ class _InitializationChain {
     dependencies ??= _dependencies;
     if (dependencies == null || dependencies.isEmpty) return;
 
-    var depsInitializingAsync =
-        dependencies.whereInitializing().whereAsyncInitialization();
+    var depsInitializingAsync = dependencies
+        .whereInitializing()
+        .whereAsyncInitialization();
 
     if (depsInitializingAsync.isEmpty) return;
 
-    var subDepsInitializing =
-        depsInitializingAsync._subDependenciesInitialized();
+    var subDepsInitializing = depsInitializingAsync
+        ._subDependenciesInitialized();
 
     //print('!!! depsInitializingAsync: $runtimeTypeNameUnsafe >> ${depsInitializingAsync.toInitializationStatus()}');
     //print('!!! subDepsInitializing: $runtimeTypeNameUnsafe >> ${subDepsInitializing.toInitializationStatus()}');
@@ -642,9 +642,8 @@ mixin Initializable {
 
               var r = await initCircular.timeout(
                 Duration(milliseconds: 1000),
-                onTimeout:
-                    () =>
-                        InitializationResult.error(this, circularTimeoutError),
+                onTimeout: () =>
+                    InitializationResult.error(this, circularTimeoutError),
               );
               if (r.ok) {
                 return r;
@@ -656,11 +655,8 @@ mixin Initializable {
                 if (parentsLength3 > parentsLength2) {
                   var r2 = await initCircular.timeout(
                     Duration(milliseconds: 1000),
-                    onTimeout:
-                        () => InitializationResult.error(
-                          this,
-                          circularTimeoutError,
-                        ),
+                    onTimeout: () =>
+                        InitializationResult.error(this, circularTimeoutError),
                   );
 
                   if (r2.ok) {
@@ -851,23 +847,18 @@ mixin Initializable {
 
     chain._markInitializedDependencies(dependencies);
 
-    var depsInits =
-        dependencies
-            .map((e) => MapEntry(e, e._doInitializationImpl(this)))
-            .toList();
+    var depsInits = dependencies
+        .map((e) => MapEntry(e, e._doInitializationImpl(this)))
+        .toList();
 
-    var depsInitsAsync =
-        depsInits
-            .where((e) => e.value is Future<InitializationResult>)
-            .map(
-              (e) => MapEntry(e.key, e.value as Future<InitializationResult>),
-            )
-            .toList();
+    var depsInitsAsync = depsInits
+        .where((e) => e.value is Future<InitializationResult>)
+        .map((e) => MapEntry(e.key, e.value as Future<InitializationResult>))
+        .toList();
 
-    var depsCompleters =
-        depsInitsAsync
-            .map((e) => MapEntry(e.key, e.value.toCompleter()))
-            .toList();
+    var depsCompleters = depsInitsAsync
+        .map((e) => MapEntry(e.key, e.value.toCompleter()))
+        .toList();
 
     chain._setInitializedDependenciesCompleters(depsCompleters);
 
@@ -919,11 +910,10 @@ mixin Initializable {
     var dependencies = result.dependencies.uniqueEntries();
 
     if (!identical(this, result.initializable)) {
-      dependencies =
-          <Initializable>[
-            result.initializable,
-            ...dependencies,
-          ].uniqueEntries();
+      dependencies = <Initializable>[
+        result.initializable,
+        ...dependencies,
+      ].uniqueEntries();
       result = InitializationResult.ok(this, dependencies: dependencies);
     }
 
@@ -940,23 +930,21 @@ mixin Initializable {
       depsResults,
     ) {
       if (depsResults.hasSkipped) {
-        var skipped =
-            depsResults.skipped
-                ?.notInitialized(ignoreFinalizing: true)
-                .toList();
+        var skipped = depsResults.skipped
+            ?.notInitialized(ignoreFinalizing: true)
+            .toList();
 
         if (skipped?.isNotEmpty ?? false) {
           return (() => _doDependenciesInitialization(
-                dependencies,
-                forceCircular: true,
-              ))
-              .tryCallThen((depsResults2) {
-                var allDepsResults = depsResults.merge(
-                  depsResults2,
-                  dependencies: dependencies,
-                );
-                return _finalizeInitializationWithDeps(allDepsResults, result);
-              }, onError: (e, s) => _onInitializationError(e, s));
+            dependencies,
+            forceCircular: true,
+          )).tryCallThen((depsResults2) {
+            var allDepsResults = depsResults.merge(
+              depsResults2,
+              dependencies: dependencies,
+            );
+            return _finalizeInitializationWithDeps(allDepsResults, result);
+          }, onError: (e, s) => _onInitializationError(e, s));
         }
       }
 
@@ -970,10 +958,9 @@ mixin Initializable {
   ) {
     var dependenciesDeep = _chain.dependenciesDeep;
 
-    var depsInitializing =
-        dependenciesDeep
-            .where((e) => e.initializationStatus.initializing)
-            .toList();
+    var depsInitializing = dependenciesDeep
+        .where((e) => e.initializationStatus.initializing)
+        .toList();
 
     if (_chain.parentsLength == 0 && depsInitializing.isNotEmpty) {
       _log.info(
@@ -1020,8 +1007,9 @@ mixin Initializable {
     InitializationResult result,
   ) {
     if (depsResults.hasSkipped) {
-      var skipped =
-          depsResults.skipped?.notInitialized(ignoreFinalizing: true).toList();
+      var skipped = depsResults.skipped
+          ?.notInitialized(ignoreFinalizing: true)
+          .toList();
 
       if (skipped?.isNotEmpty ?? false) {
         _log.warning(
@@ -1034,10 +1022,9 @@ mixin Initializable {
 
     var dependenciesDeep = _chain.dependenciesDeep;
 
-    var depsInitializing =
-        dependenciesDeep
-            .where((e) => e.initializationStatus.initializing)
-            .toList();
+    var depsInitializing = dependenciesDeep
+        .where((e) => e.initializationStatus.initializing)
+        .toList();
 
     if (_chain.parentsLength == 0 && depsInitializing.isNotEmpty) {
       _log.warning(
@@ -1189,12 +1176,11 @@ class _DependenciesInitialization {
     _DependenciesInitialization other, {
     required List<Initializable>? dependencies,
   }) {
-    var allResults =
-        [...results, ...other.results]
-            .groupBy((dep) => dep.initializable)
-            .map((dep, res) => MapEntry(dep, res.first))
-            .values
-            .toList();
+    var allResults = [...results, ...other.results]
+        .groupBy((dep) => dep.initializable)
+        .map((dep, res) => MapEntry(dep, res.first))
+        .values
+        .toList();
 
     return _DependenciesInitialization(allResults, dependencies: dependencies);
   }
@@ -1240,12 +1226,10 @@ extension InitializableListExtension<T extends Initializable> on List<T> {
   List<T> get idle =>
       where((e) => !e._status.initialized && !e._status.initializing).toList();
 
-  List<T> notInitialized({bool ignoreFinalizing = false}) =>
-      where(
-        (e) =>
-            !e._status.initialized &&
-            (!ignoreFinalizing || !e._status.finalizing),
-      ).toList();
+  List<T> notInitialized({bool ignoreFinalizing = false}) => where(
+    (e) =>
+        !e._status.initialized && (!ignoreFinalizing || !e._status.finalizing),
+  ).toList();
 }
 
 extension _ListExtension<T> on List<T> {
diff --git a/lib/src/bones_api_logging.dart b/lib/src/bones_api_logging.dart
index 673e4672..ff69cab3 100644
--- a/lib/src/bones_api_logging.dart
+++ b/lib/src/bones_api_logging.dart
@@ -533,24 +533,23 @@ abstract class LoggerHandler {
 
     Future<void>? call;
 
-    call =
-        _bufferedCalls[identifier] ??= Future.delayed(
-          Duration(milliseconds: 100),
-          () async {
-            for (var levelBlock in buffer) {
-              var level = levelBlock.$1;
-              var messages = levelBlock.$2;
-              messagesBlockLogger(level, messages);
-            }
-
-            buffer.clear();
-
-            var prevCall = _bufferedCalls[identifier];
-            if (identical(prevCall, call)) {
-              _bufferedCalls[identifier] = null;
-            }
-          },
-        );
+    call = _bufferedCalls[identifier] ??= Future.delayed(
+      Duration(milliseconds: 100),
+      () async {
+        for (var levelBlock in buffer) {
+          var level = levelBlock.$1;
+          var messages = levelBlock.$2;
+          messagesBlockLogger(level, messages);
+        }
+
+        buffer.clear();
+
+        var prevCall = _bufferedCalls[identifier];
+        if (identical(prevCall, call)) {
+          _bufferedCalls[identifier] = null;
+        }
+      },
+    );
   }
 
   void _logToHttpClient(
diff --git a/lib/src/bones_api_mixin.dart b/lib/src/bones_api_mixin.dart
index 703213f4..3289c4ba 100644
--- a/lib/src/bones_api_mixin.dart
+++ b/lib/src/bones_api_mixin.dart
@@ -94,17 +94,16 @@ mixin Pool<O extends Object> {
   FutureOr<List<O>> filterPoolElements(FutureOr<bool> Function(O o) filter) {
     var hasFuture = false;
 
-    var elements =
-        _pool.map<FutureOr<O?>>((o) {
-          var valid = filter(o);
+    var elements = _pool.map<FutureOr<O?>>((o) {
+      var valid = filter(o);
 
-          if (valid is Future<bool>) {
-            hasFuture = true;
-            return valid.then((valid) => valid ? o : null);
-          }
+      if (valid is Future<bool>) {
+        hasFuture = true;
+        return valid.then((valid) => valid ? o : null);
+      }
 
-          return valid ? o : null;
-        }).toList();
+      return valid ? o : null;
+    }).toList();
 
     if (hasFuture) {
       return elements.resolveAllNotNull();
@@ -715,22 +714,21 @@ mixin FieldsFromMap {
     Map<String, String>? mapLC,
     Map<String, String>? mapSimple,
   }) {
-    var fieldsMap =
-        fields
-            .map(
-              (f) => MapEntry(
-                f,
-                getFieldKeyInMap(
-                  f,
-                  map,
-                  fieldLC: fieldLC,
-                  fieldSimple: fieldSimple,
-                  mapLC: mapLC,
-                  mapSimple: mapSimple,
-                ),
-              ),
-            )
-            .toMapFromEntries();
+    var fieldsMap = fields
+        .map(
+          (f) => MapEntry(
+            f,
+            getFieldKeyInMap(
+              f,
+              map,
+              fieldLC: fieldLC,
+              fieldSimple: fieldSimple,
+              mapLC: mapLC,
+              mapSimple: mapSimple,
+            ),
+          ),
+        )
+        .toMapFromEntries();
 
     return fieldsMap;
   }
diff --git a/lib/src/bones_api_module.dart b/lib/src/bones_api_module.dart
index 051e4ae0..64aed248 100644
--- a/lib/src/bones_api_module.dart
+++ b/lib/src/bones_api_module.dart
@@ -595,8 +595,9 @@ class APIRouteBuilder<M extends APIModule> {
     var receivesAPIRequest = apiMethod.receivesAPIRequest;
 
     var methodRules = apiMethod.annotations.whereType<APIRouteRule>().toList();
-    var classRules =
-        classReflection.classAnnotations.whereType<APIRouteRule>().toList();
+    var classRules = classReflection.classAnnotations
+        .whereType<APIRouteRule>()
+        .toList();
 
     List<APIRouteRule> rules;
     if (methodRules.isEmpty) {
@@ -604,10 +605,9 @@ class APIRouteBuilder<M extends APIModule> {
     } else {
       var noGlobalRules = methodRules.any((r) => r.noGlobalRules);
 
-      rules =
-          noGlobalRules
-              ? methodRules
-              : [...methodRules, ...classRules.where((r) => r.globalRules)];
+      rules = noGlobalRules
+          ? methodRules
+          : [...methodRules, ...classRules.where((r) => r.globalRules)];
     }
 
     var config = apiMethod.annotations.whereType<APIRouteConfig>().firstOrNull;
@@ -630,20 +630,9 @@ class APIRouteBuilder<M extends APIModule> {
         var paramName = apiMethod.normalParametersNames.first;
         var parameters = <String, TypeInfo>{paramName: APIRequest.typeInfo};
 
-        routeHandler =
-            returnTypeInfo.hasArguments
-                ? returnTypeInfo.callCastedArgumentA(
-                  <T>() => _APIRouteHandlerAPIMethodAPIRequestAPIResponse<T>(
-                    module,
-                    requestMethod,
-                    apiMethod.name,
-                    apiMethod,
-                    parameters,
-                    rules,
-                    config,
-                  ),
-                )
-                : _APIRouteHandlerAPIMethodAPIRequestAPIResponse(
+        routeHandler = returnTypeInfo.hasArguments
+            ? returnTypeInfo.callCastedArgumentA(
+                <T>() => _APIRouteHandlerAPIMethodAPIRequestAPIResponse<T>(
                   module,
                   requestMethod,
                   apiMethod.name,
@@ -651,7 +640,17 @@ class APIRouteBuilder<M extends APIModule> {
                   parameters,
                   rules,
                   config,
-                );
+                ),
+              )
+            : _APIRouteHandlerAPIMethodAPIRequestAPIResponse(
+                module,
+                requestMethod,
+                apiMethod.name,
+                apiMethod,
+                parameters,
+                rules,
+                config,
+              );
       } else {
         var parameters = Map<String, TypeInfo>.fromEntries(
           apiMethod.allParameters.map(
@@ -659,20 +658,9 @@ class APIRouteBuilder<M extends APIModule> {
           ),
         );
 
-        routeHandler =
-            returnTypeInfo.hasArguments
-                ? returnTypeInfo.callCastedArgumentA(
-                  <T>() => _APIRouteHandlerAPIMethodReflection<T>(
-                    module,
-                    requestMethod,
-                    apiMethod.name,
-                    apiMethod,
-                    parameters,
-                    rules,
-                    config,
-                  ),
-                )
-                : _APIRouteHandlerAPIMethodReflection(
+        routeHandler = returnTypeInfo.hasArguments
+            ? returnTypeInfo.callCastedArgumentA(
+                <T>() => _APIRouteHandlerAPIMethodReflection<T>(
                   module,
                   requestMethod,
                   apiMethod.name,
@@ -680,7 +668,17 @@ class APIRouteBuilder<M extends APIModule> {
                   parameters,
                   rules,
                   config,
-                );
+                ),
+              )
+            : _APIRouteHandlerAPIMethodReflection(
+                module,
+                requestMethod,
+                apiMethod.name,
+                apiMethod,
+                parameters,
+                rules,
+                config,
+              );
       }
 
       addRouteHandler(routeHandler);
@@ -813,8 +811,9 @@ class APIRouteBuilder<M extends APIModule> {
             return TypeParser.parseMap<K, V>(
               value,
               keyParser: argParser0 is TypeElementParser<K> ? argParser0 : null,
-              valueParser:
-                  argParser1 is TypeElementParser<V> ? argParser1 : null,
+              valueParser: argParser1 is TypeElementParser<V>
+                  ? argParser1
+                  : null,
             );
           });
 
@@ -930,29 +929,27 @@ class APIRouteBuilder<M extends APIModule> {
       var listEntityType = parameterTypeInfo.listEntityType!;
 
       if (value is Iterable) {
-        var list =
-            value
-                .map(
-                  (e) => _resolveValueAsEntity(
-                    listEntityType,
-                    e,
-                    entityCache: entityCache,
-                    resolutionRules: resolutionRules,
-                  ),
-                )
-                .toList();
-
-        return _castList(list, listEntityType);
-      } else {
-        var list = TypeParser.parseList(
-          value,
-          elementParser:
+        var list = value
+            .map(
               (e) => _resolveValueAsEntity(
                 listEntityType,
                 e,
                 entityCache: entityCache,
                 resolutionRules: resolutionRules,
               ),
+            )
+            .toList();
+
+        return _castList(list, listEntityType);
+      } else {
+        var list = TypeParser.parseList(
+          value,
+          elementParser: (e) => _resolveValueAsEntity(
+            listEntityType,
+            e,
+            entityCache: entityCache,
+            resolutionRules: resolutionRules,
+          ),
         );
 
         if (list != null) {
@@ -966,10 +963,9 @@ class APIRouteBuilder<M extends APIModule> {
         );
 
         if (classReflection != null) {
-          var map =
-              value is Map<String, Object?>
-                  ? value
-                  : value.map((k, v) => MapEntry(k.toString(), v));
+          var map = value is Map<String, Object?>
+              ? value
+              : value.map((k, v) => MapEntry(k.toString(), v));
           var o = classReflection.createFromMapSync(
             map,
             entityCache: entityCache,
@@ -1025,15 +1021,14 @@ class APIRouteBuilder<M extends APIModule> {
   }
 
   List<APIRouteInfo> apiInfo([APIRequest? apiRequest]) {
-    var routesHandlers =
-        <APIRouteHandler>[
-          ...module._routesHandlers.values,
-          ...module._routesHandlersGET.values,
-          ...module._routesHandlersPOST.values,
-          ...module._routesHandlersPATH.values,
-          ...module._routesHandlersPUT.values,
-          ...module._routesHandlersDELETE.values,
-        ].toDistinctList();
+    var routesHandlers = <APIRouteHandler>[
+      ...module._routesHandlers.values,
+      ...module._routesHandlersGET.values,
+      ...module._routesHandlersPOST.values,
+      ...module._routesHandlersPATH.values,
+      ...module._routesHandlersPUT.values,
+      ...module._routesHandlersDELETE.values,
+    ].toDistinctList();
 
     var info = routesHandlers.map((e) => e.apiInfo(apiRequest)).toList();
     return info;
@@ -1229,8 +1224,9 @@ abstract class APIModuleProxyCallerListener<T>
     }
 
     var typeInfo = returnType.typeInfo;
-    var mainType =
-        typeInfo.isFuture ? (typeInfo.arguments0 ?? typeInfo) : typeInfo;
+    var mainType = typeInfo.isFuture
+        ? (typeInfo.arguments0 ?? typeInfo)
+        : typeInfo;
 
     // var debugJsonPretty = Json.encode(json, pretty: true);
     // print(debugJsonPretty);
@@ -1344,12 +1340,11 @@ class APIModuleProxyDirectCaller<T> extends APIModuleProxyCallerListener<T> {
           if (!accessRules.isInnocuous) {
             return Json.toJson(
               payload,
-              toEncodableProvider:
-                  (o) => accessRules.toJsonEncodable(
-                    apiRequest,
-                    Json.defaultToEncodableJsonProvider(),
-                    o,
-                  ),
+              toEncodableProvider: (o) => accessRules.toJsonEncodable(
+                apiRequest,
+                Json.defaultToEncodableJsonProvider(),
+                o,
+              ),
             );
           }
         }
diff --git a/lib/src/bones_api_platform.dart b/lib/src/bones_api_platform.dart
index 3d949b09..f63a5e16 100644
--- a/lib/src/bones_api_platform.dart
+++ b/lib/src/bones_api_platform.dart
@@ -167,23 +167,23 @@ class APIPlatformCapability {
            (int64
                ? int64Max.toInt()
                : (int53
-                   ? int53Max.toInt()
-                   : (int32
-                       ? int32Max.toInt()
-                       : throw StateError(
-                         'maxSafeInteger error: Platform `int` not defined!',
-                       )))),
+                     ? int53Max.toInt()
+                     : (int32
+                           ? int32Max.toInt()
+                           : throw StateError(
+                               'maxSafeInteger error: Platform `int` not defined!',
+                             )))),
        minSafeInteger =
            minSafeInteger ??
            (int64
                ? int64Min.toInt()
                : (int53
-                   ? int53Min.toInt()
-                   : (int32
-                       ? int32Min.toInt()
-                       : throw StateError(
-                         'minSafeInteger error: Platform `int` not defined!',
-                       ))));
+                     ? int53Min.toInt()
+                     : (int32
+                           ? int32Min.toInt()
+                           : throw StateError(
+                               'minSafeInteger error: Platform `int` not defined!',
+                             ))));
 
   APIPlatformCapability.bits64({required bool canReadFile})
     : this(canReadFile: canReadFile, int64: true, double64: true);
diff --git a/lib/src/bones_api_repository.dart b/lib/src/bones_api_repository.dart
index 89a6f04d..6670b063 100644
--- a/lib/src/bones_api_repository.dart
+++ b/lib/src/bones_api_repository.dart
@@ -37,13 +37,12 @@ abstract class APIRepository<O extends Object> with Initializable {
     EntityRepository<O>? entityRepository,
     EntityRepositoryProvider? provider,
     Type? type,
-  }) : entityRepository =
-           resolveEntityRepository(
-             entityRepository: entityRepository,
-             provider: provider,
-             type: type ?? O,
-             required: true,
-           )! {
+  }) : entityRepository = resolveEntityRepository(
+         entityRepository: entityRepository,
+         provider: provider,
+         type: type ?? O,
+         required: true,
+       )! {
     // ignore: discarded_futures
     this.entityRepository.ensureInitialized(parent: this);
   }
diff --git a/lib/src/bones_api_security.dart b/lib/src/bones_api_security.dart
index a4f56f7f..d29af934 100644
--- a/lib/src/bones_api_security.dart
+++ b/lib/src/bones_api_security.dart
@@ -33,8 +33,9 @@ abstract class APISecurity {
     String? sharedStoreID,
     SharedStoreProviderSync? storeProvider,
   }) : tokenDuration = tokenDuration ?? Duration(hours: 3),
-       tokenLength =
-           tokenLength != null && tokenLength > 32 ? tokenLength : 512,
+       tokenLength = tokenLength != null && tokenLength > 32
+           ? tokenLength
+           : 512,
        _sharedStoreField =
            SharedStoreField.tryFrom(
              sharedStoreField: sharedStoreField,
@@ -765,10 +766,9 @@ abstract class APISecurity {
               var credentialUsername = request.credential!.username;
               if (!usernames.contains(credentialUsername)) return null;
 
-              var tokensWithUsername =
-                  sessionTokens
-                      .where((t) => t.username == credentialUsername)
-                      .toSet();
+              var tokensWithUsername = sessionTokens
+                  .where((t) => t.username == credentialUsername)
+                  .toSet();
               return tokensWithUsername;
             } else {
               return sessionTokens;
@@ -872,8 +872,9 @@ abstract class APISecurity {
   ) {
     var username = getRequestParameterUsername(request).trim();
     var token = getRequestParameterToken(request).trim();
-    var refreshToken =
-        token.isEmpty ? getRequestParameterRefreshToken(request).trim() : '';
+    var refreshToken = token.isEmpty
+        ? getRequestParameterRefreshToken(request).trim()
+        : '';
 
     if (username.isNotEmpty) {
       if (token.isNotEmpty) {
@@ -972,8 +973,11 @@ abstract class APISecurity {
   }
 }
 
-typedef APITokenInfo =
-    ({APIToken apiToken, Object? data, List<APIPermission>? permissions});
+typedef APITokenInfo = ({
+  APIToken apiToken,
+  Object? data,
+  List<APIPermission>? permissions,
+});
 
 /// The tokens store for the [APISecurity].
 class APITokenStore {
@@ -1401,11 +1405,10 @@ class APIRoutePermissionTypeRule extends APIRouteAuthenticatedRule {
     var normalizedType = _expandoNormalizedTypes[this];
     if (normalizedType != null) return normalizedType;
 
-    normalizedType =
-        _requiredPermissionTypes
-            .map(APIPermission.normalizeType)
-            .where(APIPermission.validateType)
-            .toSet();
+    normalizedType = _requiredPermissionTypes
+        .map(APIPermission.normalizeType)
+        .where(APIPermission.validateType)
+        .toSet();
 
     _expandoNormalizedTypes[this] = normalizedType;
     return normalizedType;
@@ -1419,11 +1422,10 @@ class APIRoutePermissionTypeRule extends APIRouteAuthenticatedRule {
 
     var requiredPermissionTypes = this.requiredPermissionTypes;
 
-    var authPermissions =
-        authentication
-            .enabledPermissionsOfTypes(requiredPermissionTypes)
-            .map((e) => e.type)
-            .toSet();
+    var authPermissions = authentication
+        .enabledPermissionsOfTypes(requiredPermissionTypes)
+        .map((e) => e.type)
+        .toSet();
 
     return authPermissions.length == requiredPermissionTypes.length;
   }
@@ -1515,8 +1517,8 @@ class APIEntityRules extends APIRouteRule {
 }
 
 class SecureRandom implements Random {
-  static final Random _globalRandom1 =
-      Random()..advance(maxSteps: 211, random: Random());
+  static final Random _globalRandom1 = Random()
+    ..advance(maxSteps: 211, random: Random());
 
   static int _seedCounter = 0;
 
diff --git a/lib/src/bones_api_server.dart b/lib/src/bones_api_server.dart
index 57132e6f..caf6c741 100644
--- a/lib/src/bones_api_server.dart
+++ b/lib/src/bones_api_server.dart
@@ -234,10 +234,9 @@ class APIServerConfig {
     Object? args,
   }) : development = development ?? false,
        name = name != null && name.trim().isNotEmpty ? name : 'Bones_API',
-       version =
-           version != null && version.trim().isNotEmpty
-               ? version
-               : BonesAPI.VERSION,
+       version = version != null && version.trim().isNotEmpty
+           ? version
+           : BonesAPI.VERSION,
        address = normalizeAddress(address, apiConfig: apiConfig),
        port = resolvePort(port, apiConfig: apiConfig),
        securePort = resolveSecurePort(
@@ -352,14 +351,15 @@ class APIServerConfig {
     var address = a.optionAsString('address');
 
     var letsEncrypt = a.flag('letsencrypt');
-    var letsEncryptProduction =
-        letsEncrypt ? a.flagOr('letsencrypt-production', null) : false;
-    var allowRequestLetsEncryptCertificate =
-        letsEncrypt
-            ? a.flagOr('allow-request-letsencrypt-certificate', null)
-            : false;
-    var letsEncryptDirectory =
-        letsEncrypt ? a.optionAsDirectory('letsencrypt-directory') : null;
+    var letsEncryptProduction = letsEncrypt
+        ? a.flagOr('letsencrypt-production', null)
+        : false;
+    var allowRequestLetsEncryptCertificate = letsEncrypt
+        ? a.flagOr('allow-request-letsencrypt-certificate', null)
+        : false;
+    var letsEncryptDirectory = letsEncrypt
+        ? a.optionAsDirectory('letsencrypt-directory')
+        : null;
 
     var hotReload = a.flag('hot-reload');
     var totalWorkers = a.optionAsInt('total-workers');
@@ -522,24 +522,23 @@ class APIServerConfig {
     List domains, [
     Directory? rootDir,
   ]) {
-    var domainsRoots =
-        domains
-            .map((e) {
-              var s = e.toString();
-              var parts = s.split('=');
-
-              var domain = parts[0];
-
-              if (parts.length == 1) {
-                return rootDir != null ? MapEntry(domain, rootDir) : null;
-              } else {
-                var path = parts[1].trim();
-                var dir = path.isNotEmpty ? Directory(path) : rootDir;
-                return dir != null ? MapEntry(domain, dir) : null;
-              }
-            })
-            .nonNulls
-            .toMapFromEntries();
+    var domainsRoots = domains
+        .map((e) {
+          var s = e.toString();
+          var parts = s.split('=');
+
+          var domain = parts[0];
+
+          if (parts.length == 1) {
+            return rootDir != null ? MapEntry(domain, rootDir) : null;
+          } else {
+            var path = parts[1].trim();
+            var dir = path.isNotEmpty ? Directory(path) : rootDir;
+            return dir != null ? MapEntry(domain, dir) : null;
+          }
+        })
+        .nonNulls
+        .toMapFromEntries();
     return domainsRoots;
   }
 
@@ -706,24 +705,23 @@ class APIServerConfig {
       }
     }
 
-    List<Pattern> files =
-        list
-            .map((e) {
-              if (e is RegExp) return e;
+    List<Pattern> files = list
+        .map((e) {
+          if (e is RegExp) return e;
 
-              var s = e.toString().trim();
-              if (s.isEmpty) return null;
+          var s = e.toString().trim();
+          if (s.isEmpty) return null;
 
-              if (s.startsWith('re:')) {
-                return RegExp(s.substring(3));
-              } else if (s.startsWith('regexp:')) {
-                return RegExp(s.substring(7));
-              } else {
-                return s;
-              }
-            })
-            .nonNulls
-            .toList();
+          if (s.startsWith('re:')) {
+            return RegExp(s.substring(3));
+          } else if (s.startsWith('regexp:')) {
+            return RegExp(s.substring(7));
+          } else {
+            return s;
+          }
+        })
+        .nonNulls
+        .toList();
 
     if (list.isEmpty) {
       return def ?? [];
@@ -857,16 +855,15 @@ class APIServerConfig {
       values = [o];
     }
 
-    var entries =
-        values
-            .map(
-              (e) => parseDomainEntry(
-                e,
-                checkDirectoryExistence: checkDirectoryExistence,
-              ),
-            )
-            .nonNulls
-            .toList();
+    var entries = values
+        .map(
+          (e) => parseDomainEntry(
+            e,
+            checkDirectoryExistence: checkDirectoryExistence,
+          ),
+        )
+        .nonNulls
+        .toList();
     if (entries.isEmpty) return {};
 
     var map = _removeInvalidDomains(
@@ -978,14 +975,13 @@ class APIServerConfig {
     'apiCacheControl': apiCacheControl,
     'staticFilesCacheControl': staticFilesCacheControl,
     'longLivedStaticFilesCacheControl': longLivedStaticFilesCacheControl,
-    'longLivedStaticFilesCached':
-        longLivedStaticFilesCached.map((e) {
-          if (e is RegExp) {
-            return 'regexp:${e.pattern}';
-          } else {
-            return e.toString();
-          }
-        }).toList(),
+    'longLivedStaticFilesCached': longLivedStaticFilesCached.map((e) {
+      if (e is RegExp) {
+        return 'regexp:${e.pattern}';
+      } else {
+        return e.toString();
+      }
+    }).toList(),
     'cacheStaticFilesResponses': cacheStaticFilesResponses,
     'staticFilesCacheMaxMemorySize': staticFilesCacheMaxMemorySize,
     'staticFilesCacheMaxContentLength': staticFilesCacheMaxContentLength,
@@ -1265,11 +1261,10 @@ class APIServer extends _APIServerBase {
     if (totalAuxiliaryWorkers >= 1) {
       _log.info("Spawning $totalAuxiliaryWorkers parallel workers...");
 
-      workersSpawns =
-          await _auxiliaryWorkers
-              .map((e) => MapEntry(e, e.spawnIsolate()))
-              .toMapFromEntries()
-              .resolveAllValues();
+      workersSpawns = await _auxiliaryWorkers
+          .map((e) => MapEntry(e, e.spawnIsolate()))
+          .toMapFromEntries()
+          .resolveAllValues();
 
       _log.info("Spawned $totalAuxiliaryWorkers parallel workers.");
     }
@@ -1391,12 +1386,11 @@ class APIServer extends _APIServerBase {
     var connectionInfo = _getConnectionInfo(request);
     var requesterAddress = connectionInfo?.remoteAddress.address;
 
-    var requesterSource =
-        requesterAddress == null
-            ? APIRequesterSource.unknown
-            : (_isLocalAddress(requesterAddress)
-                ? APIRequesterSource.local
-                : APIRequesterSource.remote);
+    var requesterSource = requesterAddress == null
+        ? APIRequesterSource.unknown
+        : (_isLocalAddress(requesterAddress)
+              ? APIRequesterSource.local
+              : APIRequesterSource.remote);
 
     String? sessionID;
     bool newSession = false;
@@ -1439,10 +1433,9 @@ class APIServer extends _APIServerBase {
       if (mimeType != null && payload != null && mimeType.isFormURLEncoded) {
         var payloadMap = payload as Map<String, dynamic>;
 
-        parametersResolved =
-            parameters.isEmpty
-                ? payloadMap
-                : <String, dynamic>{...parameters, ...payloadMap};
+        parametersResolved = parameters.isEmpty
+            ? payloadMap
+            : <String, dynamic>{...parameters, ...payloadMap};
 
         payload = null;
         mimeType = null;
@@ -1495,8 +1488,9 @@ class APIServer extends _APIServerBase {
     return cookies;
   }
 
-  static final MimeType _mimeTypeTextPlain =
-      MimeType.parse(MimeType.textPlain)!;
+  static final MimeType _mimeTypeTextPlain = MimeType.parse(
+    MimeType.textPlain,
+  )!;
 
   static FutureOr<(MimeType, Object)?> _resolvePayload(
     Request request, {
@@ -1555,11 +1549,10 @@ class APIServer extends _APIServerBase {
       var requestedUri = request.requestedUri;
       mimeType = _resolveMimeTypeByExtension(requestedUri.path);
 
-      mimeType ??=
-          requestedUri.queryParameters.entries
-              .map((e) => _resolveMimeTypeByExtension(e.value))
-              .nonNulls
-              .firstOrNull;
+      mimeType ??= requestedUri.queryParameters.entries
+          .map((e) => _resolveMimeTypeByExtension(e.value))
+          .nonNulls
+          .firstOrNull;
     }
 
     return mimeType;
@@ -1580,34 +1573,35 @@ class APIServer extends _APIServerBase {
     Request request, {
     int? maxPayloadLength,
     bool? decompressPayload,
-  }) => _loadPayloadString(
-    mimeType,
-    request,
-    maxPayloadLength: maxPayloadLength,
-    decompressPayload: decompressPayload,
-  ).then((s) {
-    if (s == null) return null;
-
-    Object payload = s;
-    if (mimeType.isJSON) {
-      s = s.trim();
-      if (s.isEmpty) return null;
-      try {
-        payload = json.decode(s);
-      } catch (e, s) {
-        _log.severe(
-          "_resolvePayloadFromString> Error decoding JSON: <<$s>>",
-          e,
-          s,
-        );
-        return null;
-      }
-    } else if (mimeType.isFormURLEncoded) {
-      payload = decodeQueryStringParameters(s, charset: mimeType.charset);
-    }
+  }) =>
+      _loadPayloadString(
+        mimeType,
+        request,
+        maxPayloadLength: maxPayloadLength,
+        decompressPayload: decompressPayload,
+      ).then((s) {
+        if (s == null) return null;
+
+        Object payload = s;
+        if (mimeType.isJSON) {
+          s = s.trim();
+          if (s.isEmpty) return null;
+          try {
+            payload = json.decode(s);
+          } catch (e, s) {
+            _log.severe(
+              "_resolvePayloadFromString> Error decoding JSON: <<$s>>",
+              e,
+              s,
+            );
+            return null;
+          }
+        } else if (mimeType.isFormURLEncoded) {
+          payload = decodeQueryStringParameters(s, charset: mimeType.charset);
+        }
 
-    return (mimeType, payload);
-  });
+        return (mimeType, payload);
+      });
 
   static Future<String?> _loadPayloadString(
     MimeType mimeType,
@@ -1762,8 +1756,10 @@ class APIServer extends _APIServerBase {
     var idx = headerAuthorization.indexOf(_regExpSpace);
     if (idx <= 0) return null;
 
-    var credentialType =
-        headerAuthorization.substring(0, idx).trim().toLowerCase();
+    var credentialType = headerAuthorization
+        .substring(0, idx)
+        .trim()
+        .toLowerCase();
     var credential = headerAuthorization.substring(idx + 1).trim();
 
     if (credentialType == 'basic') {
@@ -1972,12 +1968,11 @@ class APIServer extends _APIServerBase {
           Json.encodeToSink(
             payload,
             bytesSink,
-            toEncodableProvider:
-                (o) => accessRules.toJsonEncodable(
-                  apiRequest,
-                  Json.defaultToEncodableJsonProvider(),
-                  o,
-                ),
+            toEncodableProvider: (o) => accessRules.toJsonEncodable(
+              apiRequest,
+              Json.defaultToEncodableJsonProvider(),
+              o,
+            ),
           );
 
           return _resolveJsonEncodePayloadBytes(
@@ -2049,28 +2044,25 @@ class APIServer extends _APIServerBase {
 
   @override
   String toString() {
-    var serverResponseDelayStr =
-        serverResponseDelay != null
-            ? ', serverResponseDelay: ${serverResponseDelay!.toStringUnit()}'
-            : '';
-
-    var domainsStr =
-        domainsRoots.isNotEmpty
-            ? ', domains: [${domainsRoots.entries.map((e) {
-              var key = e.key;
-              var val = e.value;
-
-              return '${key is RegExp ? 'r/${key.pattern}/' : '`$key`'}=${val.path}';
-            }).join(' ; ')}]'
-            : '';
-
-    var secureStr =
-        securePort < 10
-            ? ''
-            : ', securePort: $securePort, '
-                'letsEncrypt: $letsEncrypt'
-                '${(letsEncrypt ? (letsEncryptProduction ? ' @production' : ' @staging') : '')}, '
-                'letsEncryptDirectory: ${letsEncryptDirectory?.path}';
+    var serverResponseDelayStr = serverResponseDelay != null
+        ? ', serverResponseDelay: ${serverResponseDelay!.toStringUnit()}'
+        : '';
+
+    var domainsStr = domainsRoots.isNotEmpty
+        ? ', domains: [${domainsRoots.entries.map((e) {
+            var key = e.key;
+            var val = e.value;
+
+            return '${key is RegExp ? 'r/${key.pattern}/' : '`$key`'}=${val.path}';
+          }).join(' ; ')}]'
+        : '';
+
+    var secureStr = securePort < 10
+        ? ''
+        : ', securePort: $securePort, '
+              'letsEncrypt: $letsEncrypt'
+              '${(letsEncrypt ? (letsEncryptProduction ? ' @production' : ' @staging') : '')}, '
+              'letsEncryptDirectory: ${letsEncryptDirectory?.path}';
 
     return 'APIServer[${BonesAPI.VERSION}]{ '
         'apiRoot: ${apiRoot.name}[${apiRoot.version}] (${apiRoot.runtimeTypeNameUnsafe}), '
@@ -2128,15 +2120,14 @@ class APIServer extends _APIServerBase {
       address = _parseArg(args, 'address', 'a', 'localhost', 0);
       port = int.parse(_parseArg(args, 'port', 'p', '8080', 1));
 
-      var hotReloadStr =
-          _parseArg(
-            args,
-            'hotreload',
-            'r',
-            'false',
-            2,
-            flag: true,
-          ).toLowerCase();
+      var hotReloadStr = _parseArg(
+        args,
+        'hotreload',
+        'r',
+        'false',
+        2,
+        flag: true,
+      ).toLowerCase();
 
       hotReload = hotReloadStr == 'true' || hotReloadStr == 'hotreload';
 
@@ -2338,8 +2329,8 @@ final class APIServerWorker extends _APIServerBase {
   final Map<String, Handler> _directoriesStaticHandlers = <String, Handler>{};
 
   Handler _getDirectoryStaticHandler(Directory rootDirectory) =>
-      _directoriesStaticHandlers[rootDirectory
-          .path] ??= _createDirectoryHandler(rootDirectory);
+      _directoriesStaticHandlers[rootDirectory.path] ??=
+          _createDirectoryHandler(rootDirectory);
 
   APIServerResponseCache? _responseCache;
 
@@ -2351,11 +2342,10 @@ final class APIServerWorker extends _APIServerBase {
     var gzipCompressionLevel = 4;
 
     if (cacheStaticFilesResponses) {
-      var responseCache =
-          _responseCache = APIServerResponseCache(
-            maxMemorySize: staticFilesCacheMaxMemorySize,
-            maxContentLength: staticFilesCacheMaxContentLength,
-          );
+      var responseCache = _responseCache = APIServerResponseCache(
+        maxMemorySize: staticFilesCacheMaxMemorySize,
+        maxContentLength: staticFilesCacheMaxContentLength,
+      );
 
       pipeline = pipeline.addMiddleware(responseCache.middleware);
 
@@ -2630,10 +2620,9 @@ final class APIServerWorker extends _APIServerBase {
       _log.info('Using `SESSIONID` cookies.');
     }
 
-    var workerInfo =
-        totalWorkers > 1
-            ? '[${isMainWorker ? 'main' : 'auxiliary'} worker#$workerIndex/$totalWorkers]'
-            : '';
+    var workerInfo = totalWorkers > 1
+        ? '[${isMainWorker ? 'main' : 'auxiliary'} worker#$workerIndex/$totalWorkers]'
+        : '';
 
     _log.info('Started HTTP Server$workerInfo at: $address:$port');
 
@@ -3157,10 +3146,9 @@ final class APIServerWorker extends _APIServerBase {
       headers['keep-alive'] = 'timeout=$timeout, max=$max';
     }
 
-    var allMetrics =
-        apiRequest.hasMetrics
-            ? CombinedMapView([apiRequest.metrics, apiResponse.metrics])
-            : apiResponse.metrics;
+    var allMetrics = apiRequest.hasMetrics
+        ? CombinedMapView([apiRequest.metrics, apiResponse.metrics])
+        : apiResponse.metrics;
 
     headers['server-timing'] = APIServer.resolveServerTiming(
       allMetrics,
@@ -3281,23 +3269,21 @@ final class APIServerWorker extends _APIServerBase {
 
   @override
   String toString() {
-    var domainsStr =
-        domainsRoots.isNotEmpty
-            ? ', domains: [${domainsRoots.entries.map((e) {
-              var key = e.key;
-              var val = e.value;
-
-              return '${key is RegExp ? 'r/${key.pattern}/' : '`$key`'}=${val.path}';
-            }).join(' ; ')}]'
-            : '';
-
-    var secureStr =
-        securePort < 10
-            ? ''
-            : ', securePort: $securePort, '
-                'letsEncrypt: $letsEncrypt'
-                '${(letsEncrypt ? (letsEncryptProduction ? ' @production' : ' @staging') : '')}, '
-                'letsEncryptDirectory: ${letsEncryptDirectory?.path}';
+    var domainsStr = domainsRoots.isNotEmpty
+        ? ', domains: [${domainsRoots.entries.map((e) {
+            var key = e.key;
+            var val = e.value;
+
+            return '${key is RegExp ? 'r/${key.pattern}/' : '`$key`'}=${val.path}';
+          }).join(' ; ')}]'
+        : '';
+
+    var secureStr = securePort < 10
+        ? ''
+        : ', securePort: $securePort, '
+              'letsEncrypt: $letsEncrypt'
+              '${(letsEncrypt ? (letsEncryptProduction ? ' @production' : ' @staging') : '')}, '
+              'letsEncryptDirectory: ${letsEncryptDirectory?.path}';
 
     return 'APIServerWorker{ apiRoot: ${apiRoot.name}[${apiRoot.version}] (${apiRoot.runtimeTypeNameUnsafe}), address: $address, port: $port$secureStr, cacheStaticFilesResponses: $cacheStaticFilesResponses, hotReload: $hotReload (${APIHotReload.get().isEnabled ? 'enabled' : 'disabled'}), cookieless: $cookieless, SESSIONID: $useSessionID, started: $isStarted, stopped: $isStopped$domainsStr }';
   }
diff --git a/lib/src/bones_api_server_cache.dart b/lib/src/bones_api_server_cache.dart
index a113b853..2719f17b 100644
--- a/lib/src/bones_api_server_cache.dart
+++ b/lib/src/bones_api_server_cache.dart
@@ -1312,9 +1312,9 @@ extension _MapMemorySize on Map<Object?, Object?>? {
     return self == null
         ? 0
         : 8 +
-            self.entries
-                .map((e) => 32 + e.key.memorySize + e.value.memorySize)
-                .sum;
+              self.entries
+                  .map((e) => 32 + e.key.memorySize + e.value.memorySize)
+                  .sum;
   }
 }
 
@@ -1324,9 +1324,9 @@ extension _MapStringObjectMemorySize on Map<String, Object?>? {
     return self == null
         ? 0
         : 8 +
-            self.entries
-                .map((e) => 32 + e.key.memorySize + e.value.memorySize)
-                .sum;
+              self.entries
+                  .map((e) => 32 + e.key.memorySize + e.value.memorySize)
+                  .sum;
   }
 }
 
diff --git a/lib/src/bones_api_sql_builder.dart b/lib/src/bones_api_sql_builder.dart
index 0b40bc9c..e4c97240 100644
--- a/lib/src/bones_api_sql_builder.dart
+++ b/lib/src/bones_api_sql_builder.dart
@@ -93,6 +93,14 @@ class SQLDialect extends DBDialect {
   /// If `true` indicates that this adapter's SQL needs a temporary table to return rows for inserts/deletes.
   final bool acceptsTemporaryTableForReturning;
 
+  /// If `true` a `RETURNING` clause can select all the columns of a table
+  /// qualified by its alias (`RETURNING "alias".*`).
+  ///
+  /// SQLite only accepts the unqualified wildcard (`RETURNING *`), rejecting
+  /// the qualified form with *"RETURNING may not use TABLE.\* wildcards"*.
+  /// Only meaningful when [acceptsReturningSyntax] is `true`.
+  final bool returningAcceptsTableWildcard;
+
   /// If `true` indicates that this adapter's SQL can use the `DEFAULT VALUES` directive for inserts.
   final bool acceptsInsertDefaultValues;
 
@@ -129,6 +137,7 @@ class SQLDialect extends DBDialect {
     this.acceptsOutputSyntax = false,
     this.acceptsReturningSyntax = false,
     this.acceptsTemporaryTableForReturning = false,
+    this.returningAcceptsTableWildcard = true,
     this.acceptsInsertDefaultValues = false,
     this.acceptsInsertIgnore = false,
     this.acceptsInsertOnConflict = false,
@@ -195,6 +204,7 @@ class SQLDialect extends DBDialect {
         'acceptsOutputSyntax: $acceptsOutputSyntax, '
         'acceptsReturningSyntax: $acceptsReturningSyntax, '
         'acceptsTemporaryTableForReturning: $acceptsTemporaryTableForReturning, '
+        'returningAcceptsTableWildcard: $returningAcceptsTableWildcard, '
         'acceptsInsertDefaultValues: $acceptsInsertDefaultValues, '
         'acceptsInsertIgnore: $acceptsInsertIgnore, '
         'acceptsInsertOnConflict: $acceptsInsertOnConflict, '
@@ -243,12 +253,9 @@ abstract class SQLBuilder implements Comparable<SQLBuilder> {
   /// Build all the `SQL`s, including the [extraSQLBuilders].
   List<String> buildAllSQLs({bool multiline = true, bool ifNotExists = true}) {
     var allSQLBuilders = this.allSQLBuilders;
-    var sqls =
-        allSQLBuilders
-            .map(
-              (e) => e.buildSQL(multiline: multiline, ifNotExists: ifNotExists),
-            )
-            .toList();
+    var sqls = allSQLBuilders
+        .map((e) => e.buildSQL(multiline: multiline, ifNotExists: ifNotExists))
+        .toList();
     return sqls;
   }
 }
@@ -383,29 +390,27 @@ class CreateTableSQL extends TableSQL {
   List<String>? _referenceTables;
 
   @override
-  List<String> get referenceTables =>
-      _referenceTables ??=
-          <String>{
-            ...entries.expand((e) => e.referenceTables ?? <String>[]),
-          }.toList();
+  List<String> get referenceTables => _referenceTables ??= <String>{
+    ...entries.expand((e) => e.referenceTables ?? <String>[]),
+  }.toList();
 
   List<String>? _relationshipsTables;
 
   /// Returns the tables of the [relationships].
-  List<String> get relationshipsTables =>
-      _relationshipsTables ??=
-          <String>{
-            ...?relationships?.expand(
-              (e) => e.referenceTables.where((t) => t != table),
-            ),
-          }.toList();
+  List<String> get relationshipsTables => _relationshipsTables ??= <String>{
+    ...?relationships?.expand(
+      (e) => e.referenceTables.where((t) => t != table),
+    ),
+  }.toList();
 
   List<String>? _referenceAndRelationshipTables;
 
   /// Returns the tables in [referenceTables] and [relationshipsTables].
   List<String> get referenceAndRelationshipTables =>
-      _referenceAndRelationshipTables ??=
-          <String>{...referenceTables, ...relationshipsTables}.toList();
+      _referenceAndRelationshipTables ??= <String>{
+        ...referenceTables,
+        ...relationshipsTables,
+      }.toList();
 
   @override
   List<String> get dependentTables => referenceAndRelationshipTables;
@@ -436,10 +441,9 @@ class CreateTableSQL extends TableSQL {
     var constraints = this.constraints;
 
     if (onlyDependents) {
-      constraints =
-          constraints
-              .where((c) => c.referenceTables?.any((t) => t != table) ?? false)
-              .toList();
+      constraints = constraints
+          .where((c) => c.referenceTables?.any((t) => t != table) ?? false)
+          .toList();
     }
 
     var alterTablesConstraint = <AlterTableSQL>[];
@@ -591,11 +595,9 @@ class AlterTableSQL extends TableSQL {
   List<String>? _referenceTables;
 
   @override
-  List<String> get referenceTables =>
-      _referenceTables ??=
-          <String>{
-            ...entries.expand((e) => e.referenceTables ?? <String>[]).nonNulls,
-          }.toList();
+  List<String> get referenceTables => _referenceTables ??= <String>{
+    ...entries.expand((e) => e.referenceTables ?? <String>[]).nonNulls,
+  }.toList();
 
   @override
   List<String> get dependentTables => referenceTables;
@@ -698,13 +700,12 @@ extension SQLBuilderIterableMapEntryExtension<K>
     var allSQLs = expand((e) => e.value.allSQLBuilders).toList();
     allSQLs.bestOrder();
 
-    var ordered =
-        sorted((a, b) {
-          var i1 = allSQLs.indexOf(a.value);
-          var i2 = allSQLs.indexOf(b.value);
-          var cmp = i1.compareTo(i2);
-          return cmp;
-        }).toList();
+    var ordered = sorted((a, b) {
+      var i1 = allSQLs.indexOf(a.value);
+      var i2 = allSQLs.indexOf(b.value);
+      var cmp = i1.compareTo(i2);
+      return cmp;
+    }).toList();
 
     return ordered;
   }
@@ -716,13 +717,12 @@ extension SQLBuilderIterableMapEntryExtension<K>
       (e) => e.value.allSQLBuilders,
     ).toList().toHierarchicalOrder(verbose: verbose);
 
-    var ordered =
-        sorted((a, b) {
-          var i1 = allSQLs.indexOf(a.value);
-          var i2 = allSQLs.indexOf(b.value);
-          var cmp = i1.compareTo(i2);
-          return cmp;
-        }).toList();
+    var ordered = sorted((a, b) {
+      var i1 = allSQLs.indexOf(a.value);
+      var i2 = allSQLs.indexOf(b.value);
+      var cmp = i1.compareTo(i2);
+      return cmp;
+    }).toList();
 
     return ordered;
   }
@@ -747,14 +747,14 @@ extension SQLBuilderListExtension on List<SQLBuilder> {
     for (var sql in this) {
       if (processed.add(sql)) {
         var dependentTables = sql.dependentTables;
-        var dependentSQLs =
-            dependentTables
-                ?.map((t) => createTables.getCreateTable(t))
-                .nonNulls
-                .toList();
+        var dependentSQLs = dependentTables
+            ?.map((t) => createTables.getCreateTable(t))
+            .nonNulls
+            .toList();
 
-        var unprocessedDependencies =
-            dependentSQLs?.where((s) => !processed.contains(s)).toList();
+        var unprocessedDependencies = dependentSQLs
+            ?.where((s) => !processed.contains(s))
+            .toList();
 
         if (unprocessedDependencies != null &&
             unprocessedDependencies.isNotEmpty) {
@@ -843,10 +843,9 @@ extension SQLBuilderListExtension on List<SQLBuilder> {
         : refTables.where((r) => _indexOfTable(r, 0) != null).toList();
   }
 
-  Map<SQLBuilder, List<String>> _entriesReferences() =>
-      map(
-        (e) => MapEntry(e, _referenceTablesInList(e.referenceTables)),
-      ).toMapFromEntries();
+  Map<SQLBuilder, List<String>> _entriesReferences() => map(
+    (e) => MapEntry(e, _referenceTablesInList(e.referenceTables)),
+  ).toMapFromEntries();
 
   Map<SQLBuilder, List<String>> _entriesRelationships() =>
       whereType<CreateTableSQL>()
@@ -883,21 +882,20 @@ extension SQLBuilderListExtension on List<SQLBuilder> {
     final entriesReferences = _entriesReferences();
     final entriesRelationships = _entriesRelationships();
 
-    var withParents =
-        whereType<TableSQL>().where((e) => e.parentTable != null).toList();
+    var withParents = whereType<TableSQL>()
+        .where((e) => e.parentTable != null)
+        .toList();
     removeAll(withParents);
 
-    var withRelationship =
-        whereType<CreateTableSQL>()
-            .where((e) => e.relationshipsTables.isNotEmpty)
-            .toList();
+    var withRelationship = whereType<CreateTableSQL>()
+        .where((e) => e.relationshipsTables.isNotEmpty)
+        .toList();
     removeAll(withRelationship);
 
-    var withReference =
-        where((e) {
-          var referenceTables = e.referenceTables;
-          return referenceTables != null && referenceTables.isNotEmpty;
-        }).toList();
+    var withReference = where((e) {
+      var referenceTables = e.referenceTables;
+      return referenceTables != null && referenceTables.isNotEmpty;
+    }).toList();
     removeAll(withReference);
 
     withParents._bestOrderLoop(
@@ -917,10 +915,9 @@ extension SQLBuilderListExtension on List<SQLBuilder> {
 
     _bestOrderLoop();
 
-    refsGetter(SQLBuilder e) =>
-        e is CreateTableSQL
-            ? e.referenceAndRelationshipTables
-            : e.referenceTables ?? [];
+    refsGetter(SQLBuilder e) => e is CreateTableSQL
+        ? e.referenceAndRelationshipTables
+        : e.referenceTables ?? [];
 
     _addByRefPos(withReference, addAtEnd: true);
     _addByRefPos(withRelationship, addAtEnd: true, refsGetter: refsGetter);
@@ -1254,11 +1251,10 @@ extension SQLBuilderListExtension on List<SQLBuilder> {
     graph.populate(
       this,
       inputsProvider: (step, sql) => getCreateTables(sql.dependentTables),
-      outputsProvider:
-          (step, sql) => [
-            ...?sql.extraSQLBuilders,
-            //if (sql is CreateTableSQL) ...getCreateTables(sql.relationshipsTables)
-          ],
+      outputsProvider: (step, sql) => [
+        ...?sql.extraSQLBuilders,
+        //if (sql is CreateTableSQL) ...getCreateTables(sql.relationshipsTables)
+      ],
     );
 
     return graph;
@@ -1271,15 +1267,14 @@ extension SQLBuilderListExtension on List<SQLBuilder> {
 
     var graph = toGraph();
 
-    var sqlBuildOrder =
-        graph
-            .walkOutputsOrderFrom(
-              graph.rootValues,
-              sortByInputDependency: true,
-              expandSideRoots: true,
-              maxExpansion: 1,
-            )
-            .toListOfValues();
+    var sqlBuildOrder = graph
+        .walkOutputsOrderFrom(
+          graph.rootValues,
+          sortByInputDependency: true,
+          expandSideRoots: true,
+          maxExpansion: 1,
+        )
+        .toListOfValues();
 
     var invalidSQLsOrders = sqlBuildOrder.invalidSQLsOrder();
 
@@ -1510,11 +1505,10 @@ abstract mixin class SQLGenerator {
 
     var idName = entityHandler.idFieldName();
     var idType = entityHandler.idType();
-    var idEntityAnnotations =
-        entityHandler
-            .getFieldEntityAnnotations(null, idName)
-            ?.whereType<EntityField>()
-            .toList();
+    var idEntityAnnotations = entityHandler
+        .getFieldEntityAnnotations(null, idName)
+        ?.whereType<EntityField>()
+        .toList();
 
     var sqlType = foreignKeyTypeToSQLType(
       TypeInfo.fromType(idType),
@@ -1821,11 +1815,10 @@ abstract mixin class SQLGenerator {
     var idType = entityHandler.idType();
 
     var idColumnName = normalizeColumnName(idFieldName);
-    var idAnnotations =
-        entityHandler
-            .getFieldEntityAnnotations(null, idFieldName)
-            ?.whereType<EntityField>()
-            .toList();
+    var idAnnotations = entityHandler
+        .getFieldEntityAnnotations(null, idFieldName)
+        ?.whereType<EntityField>()
+        .toList();
 
     var idTypeSQL = primaryKeyTypeToSQLType(
       idType,
@@ -1843,12 +1836,11 @@ abstract mixin class SQLGenerator {
 
     var indexSQLs = <CreateIndexSQL>[];
 
-    var fieldsEntries =
-        entityHandler
-            .fieldsTypes()
-            .entries
-            .where((e) => !e.value.isListEntityOrReference)
-            .toList();
+    var fieldsEntries = entityHandler
+        .fieldsTypes()
+        .entries
+        .where((e) => !e.value.isListEntityOrReference)
+        .toList();
 
     if (sortColumns) {
       fieldsEntries.sort((a, b) => a.key.compareTo(b.key));
@@ -1862,11 +1854,10 @@ abstract mixin class SQLGenerator {
       var fieldType = e.value;
       if (fieldName == idFieldName) continue;
 
-      var entityFieldAnnotations =
-          entityHandler
-              .getFieldEntityAnnotations(null, fieldName)
-              ?.whereType<EntityField>()
-              .toList();
+      var entityFieldAnnotations = entityHandler
+          .getFieldEntityAnnotations(null, fieldName)
+          ?.whereType<EntityField>()
+          .toList();
 
       if (entityFieldAnnotations != null && entityFieldAnnotations.hasHidden) {
         continue;
@@ -2033,22 +2024,20 @@ abstract mixin class SQLGenerator {
 
     var relationshipSQLs = <CreateTableSQL>[];
 
-    var relationshipEntries =
-        entityHandler
-            .fieldsTypes()
-            .entries
-            .where((e) => e.value.isListEntityOrReference)
-            .toList();
+    var relationshipEntries = entityHandler
+        .fieldsTypes()
+        .entries
+        .where((e) => e.value.isListEntityOrReference)
+        .toList();
 
     for (var e in relationshipEntries) {
       var fieldName = e.key;
       var fieldType = e.value.arguments0!;
 
-      var entityFieldAnnotations =
-          entityHandler
-              .getFieldEntityAnnotations(null, fieldName)
-              ?.whereType<EntityField>()
-              .toList();
+      var entityFieldAnnotations = entityHandler
+          .getFieldEntityAnnotations(null, fieldName)
+          ?.whereType<EntityField>()
+          .toList();
 
       var columnName = normalizeColumnName(fieldName);
 
diff --git a/lib/src/bones_api_test_utils_config.dart b/lib/src/bones_api_test_utils_config.dart
index 4da8cf78..327f5715 100644
--- a/lib/src/bones_api_test_utils_config.dart
+++ b/lib/src/bones_api_test_utils_config.dart
@@ -360,11 +360,10 @@ class APITestConfigDBSQLMemory extends APITestConfigDB with APITestConfigBase {
 
     var tables = allRepositories.map((e) => e.name).toList();
 
-    var tablesSchemes =
-        await tables
-            .map((t) => sqlAdapter.getTableScheme(t))
-            .toList()
-            .resolveAll();
+    var tablesSchemes = await tables
+        .map((t) => sqlAdapter.getTableScheme(t))
+        .toList()
+        .resolveAll();
 
     var relationshipTables = tablesSchemes.nonNulls.expand(
       (e) => e.tableRelationshipReference.values.expand((e) => e),
diff --git a/lib/src/bones_api_test_utils_postgres.dart b/lib/src/bones_api_test_utils_postgres.dart
index 9c6961d3..da9fb8b3 100644
--- a/lib/src/bones_api_test_utils_postgres.dart
+++ b/lib/src/bones_api_test_utils_postgres.dart
@@ -72,11 +72,10 @@ class APITestConfigDockerPostgreSQL
     var body = res.split(RegExp(r'--+\+--+\+--+\+'))[1];
     var parts = body.split(RegExp(r'[\r\n]'));
 
-    var names =
-        parts
-            .where((p) => p.contains(RegExp(r'\s+\|\s+\w+\s+\|')))
-            .map((p) => p.split(RegExp(r'\s+\|\s+'))[1].trim())
-            .toList();
+    var names = parts
+        .where((p) => p.contains(RegExp(r'\s+\|\s+\w+\s+\|')))
+        .map((p) => p.split(RegExp(r'\s+\|\s+'))[1].trim())
+        .toList();
 
     return names;
   }
diff --git a/lib/src/bones_api_test_utils_sqlite.dart b/lib/src/bones_api_test_utils_sqlite.dart
new file mode 100644
index 00000000..b58ace05
--- /dev/null
+++ b/lib/src/bones_api_test_utils_sqlite.dart
@@ -0,0 +1,125 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:logging/logging.dart' as logging;
+
+import 'bones_api_entity_db_sqlite.dart';
+import 'bones_api_test_utils_config.dart';
+import 'bones_api_utils.dart';
+
+final _log = logging.Logger('APITestConfigSQLite');
+
+/// A [APITestConfigDBSQL] for a SQLite database.
+///
+/// Unlike the PostgreSQL and MySQL test configurations this needs no Docker
+/// container: SQLite is embedded, so [start] only decides *where* the database
+/// lives — an in-memory database, or a file in a temporary directory that
+/// [stop] deletes.
+class APITestConfigSQLite extends APITestConfigDBSQL
+    implements WithRuntimeTypeNameSafe {
+  @override
+  String get runtimeTypeNameSafe => 'APITestConfigSQLite';
+
+  /// If `true` uses an in-memory database instead of a temporary file.
+  final bool memory;
+
+  /// The adapter under test.
+  ///
+  /// [runSQL] and [listTables] must reach the *same* database as the entity
+  /// tests, and an in-memory database is only reachable through the adapter
+  /// that owns its handle, so the test's adapter creator has to assign this.
+  DBSQLiteAdapter? sqlAdapter;
+
+  Directory? _tempDir;
+
+  APITestConfigSQLite(Map<String, dynamic> apiConfig, {this.memory = false})
+    : super('SQLite', apiConfig) {
+    DBSQLiteAdapter.boot();
+  }
+
+  @override
+  Map<String, dynamic> get dbConfig {
+    var db = apiConfigMap['db'];
+    if (db is! Map) {
+      db = apiConfigMap['db'] = <String, dynamic>{};
+    }
+
+    var sqlite = db['sqlite'];
+    if (sqlite is! Map) {
+      sqlite = db['sqlite'] = <String, dynamic>{};
+    }
+
+    return sqlite as Map<String, dynamic>;
+  }
+
+  /// SQLite is embedded: there is no port to allocate.
+  @override
+  FutureOr<int> resolveFreePort(int port) => 0;
+
+  /// The resolved database path (`:memory:` when [memory]).
+  String get databasePath => dbConfig['path']?.toString() ?? sqliteMemoryPath;
+
+  @override
+  FutureOr<bool> start() {
+    var config = dbConfig;
+
+    if (memory) {
+      config['memory'] = true;
+      config['path'] = sqliteMemoryPath;
+    } else {
+      var dir = _tempDir ??= Directory.systemTemp.createTempSync(
+        'bones_api_test_sqlite_',
+      );
+      config['memory'] = false;
+      config['path'] = '${dir.path}/test.db';
+    }
+
+    _log.info('** STARTED> $this');
+
+    return true;
+  }
+
+  @override
+  FutureOr<bool> stop() {
+    sqlAdapter = null;
+
+    var dir = _tempDir;
+    if (dir != null) {
+      _tempDir = null;
+      try {
+        dir.deleteSync(recursive: true);
+      } catch (e) {
+        _log.warning("Error deleting temporary directory: ${dir.path}", e);
+      }
+    }
+
+    return true;
+  }
+
+  @override
+  Future<String?> runSQL(String sqlInline) async {
+    var sqlAdapter = _requireAdapter();
+    sqlAdapter.executeRawSQL(sqlInline);
+    return '';
+  }
+
+  @override
+  Future<List<String>> listTables() async =>
+      _requireAdapter().listTablesNames();
+
+  DBSQLiteAdapter _requireAdapter() {
+    var sqlAdapter = this.sqlAdapter;
+    if (sqlAdapter == null) {
+      throw StateError(
+        "Null `sqlAdapter`: the test's adapter creator must assign "
+        "`APITestConfigSQLite.sqlAdapter`, so that `runSQL` and `listTables` "
+        "reach the same database.",
+      );
+    }
+    return sqlAdapter;
+  }
+
+  @override
+  String toString() =>
+      '$runtimeTypeNameSafe{${memory ? 'memory' : databasePath}}';
+}
diff --git a/lib/src/bones_api_types.dart b/lib/src/bones_api_types.dart
index fac65c05..97a29c7c 100644
--- a/lib/src/bones_api_types.dart
+++ b/lib/src/bones_api_types.dart
@@ -416,28 +416,27 @@ class Time implements Comparable<Time> {
     int month = 1,
     int day = 1,
     bool utc = true,
-  ]) =>
-      utc
-          ? DateTime.utc(
-            year,
-            month,
-            day,
-            hour,
-            minute,
-            second,
-            millisecond,
-            microsecond,
-          )
-          : DateTime(
-            year,
-            month,
-            day,
-            hour,
-            minute,
-            second,
-            millisecond,
-            microsecond,
-          );
+  ]) => utc
+      ? DateTime.utc(
+          year,
+          month,
+          day,
+          hour,
+          minute,
+          second,
+          millisecond,
+          microsecond,
+        )
+      : DateTime(
+          year,
+          month,
+          day,
+          hour,
+          minute,
+          second,
+          millisecond,
+          microsecond,
+        );
 
   /// Returns the total minutes of this [Time] period.
   int get totalMinutes => (hour * 60) + minute;
diff --git a/lib/src/bones_api_utils_arguments.dart b/lib/src/bones_api_utils_arguments.dart
index 39e07507..cb160593 100644
--- a/lib/src/bones_api_utils_arguments.dart
+++ b/lib/src/bones_api_utils_arguments.dart
@@ -53,10 +53,9 @@ class Arguments {
   }) {
     var arguments = <String>[];
 
-    var keysAbbreviations =
-        abbreviateFlags || abbreviateParameters
-            ? this.keysAbbreviations
-            : abbreviations;
+    var keysAbbreviations = abbreviateFlags || abbreviateParameters
+        ? this.keysAbbreviations
+        : abbreviations;
 
     for (var f in flags) {
       if (abbreviateFlags) {
diff --git a/lib/src/bones_api_utils_json.dart b/lib/src/bones_api_utils_json.dart
index d2896add..a2a0645f 100644
--- a/lib/src/bones_api_utils_json.dart
+++ b/lib/src/bones_api_utils_json.dart
@@ -251,12 +251,11 @@ class Json {
       removeField: removeField,
       removeNullFields: removeNullFields,
       toEncodable: toEncodable == null ? null : (o, j) => toEncodable(o),
-      toEncodableProvider:
-          toEncodableProvider != null
-              ? (o) =>
-                  toEncodableProvider(o) ??
-                  _jsonEncodableProvider(o, entityHandlerProvider)
-              : (o) => _jsonEncodableProvider(o, entityHandlerProvider),
+      toEncodableProvider: toEncodableProvider != null
+          ? (o) =>
+                toEncodableProvider(o) ??
+                _jsonEncodableProvider(o, entityHandlerProvider)
+          : (o) => _jsonEncodableProvider(o, entityHandlerProvider),
       entityCache: entityCache,
       forceDuplicatedEntitiesAsID: true,
     );
@@ -264,7 +263,8 @@ class Json {
 
   static ToEncodableJsonProvider defaultToEncodableJsonProvider([
     EntityHandlerProvider? entityHandlerProvider,
-  ]) => (o) => _jsonEncodableProvider(o, entityHandlerProvider);
+  ]) =>
+      (o) => _jsonEncodableProvider(o, entityHandlerProvider);
 
   static ToEncodableJson? _jsonEncodableProvider(
     Object object,
@@ -571,8 +571,8 @@ class Json {
 
   static final JsonDecoder defaultDecoder = JsonDecoder(
     jsonValueDecoderProvider: _jsonValueDecoderProvider,
-    jsomMapDecoderAsyncProvider:
-        (t, m, j) => _jsomMapDecoderAsyncProvider(t, j, null, null),
+    jsomMapDecoderAsyncProvider: (t, m, j) =>
+        _jsomMapDecoderAsyncProvider(t, j, null, null),
     jsomMapDecoderProvider: (t, m, j) => _jsomMapDecoderProvider(t, j, null),
     entityCache: JsonEntityCacheSimple(),
     forceDuplicatedEntitiesAsID: true,
@@ -590,26 +590,24 @@ class Json {
     }
 
     return JsonDecoder(
-      jsonValueDecoderProvider:
-          (t, v, j) => _jsonValueDecoderProvider(
-            t,
-            v,
-            j,
-            entityHandlerProvider,
-            entityCache,
-          ),
+      jsonValueDecoderProvider: (t, v, j) => _jsonValueDecoderProvider(
+        t,
+        v,
+        j,
+        entityHandlerProvider,
+        entityCache,
+      ),
       jsomMapDecoder: jsomMapDecoder,
-      jsomMapDecoderAsyncProvider:
-          (t, m, j) => _jsomMapDecoderAsyncProvider(
-            t,
-            j,
-            entityHandlerProvider,
-            entityCache,
-          ),
-      jsomMapDecoderProvider:
-          (t, m, j) => _jsomMapDecoderProvider(t, j, entityHandlerProvider),
-      iterableCaster:
-          (v, t, j) => _iterableCaster(v, t, j, entityHandlerProvider),
+      jsomMapDecoderAsyncProvider: (t, m, j) => _jsomMapDecoderAsyncProvider(
+        t,
+        j,
+        entityHandlerProvider,
+        entityCache,
+      ),
+      jsomMapDecoderProvider: (t, m, j) =>
+          _jsomMapDecoderProvider(t, j, entityHandlerProvider),
+      iterableCaster: (v, t, j) =>
+          _iterableCaster(v, t, j, entityHandlerProvider),
       entityCache: entityCache,
       forceDuplicatedEntitiesAsID: true,
     );
@@ -692,9 +690,8 @@ class Json {
       return (m, j) => classReflection.createInstanceFromMap(
         m,
         fieldNameResolver: defaultFieldNameResolver,
-        fieldValueResolver:
-            (f, v, t) =>
-                defaultFieldValueResolver(f, v, t, j, entityHandlerProvider),
+        fieldValueResolver: (f, v, t) =>
+            defaultFieldValueResolver(f, v, t, j, entityHandlerProvider),
       );
     }
 
@@ -724,9 +721,8 @@ class Json {
       return (m, j) => classReflection.createInstanceFromMap(
         m,
         fieldNameResolver: defaultFieldNameResolver,
-        fieldValueResolver:
-            (f, v, t) =>
-                defaultFieldValueResolver(f, v, t, j, entityHandlerProvider),
+        fieldValueResolver: (f, v, t) =>
+            defaultFieldValueResolver(f, v, t, j, entityHandlerProvider),
       );
     }
 
@@ -814,8 +810,9 @@ class Json {
     JsonDecoder jsonDecoder,
     EntityHandlerProvider? entityHandlerProvider,
   ) {
-    final entityTypeReflection =
-        type.isListEntityOrReference ? type.arguments0! : type;
+    final entityTypeReflection = type.isListEntityOrReference
+        ? type.arguments0!
+        : type;
     final entityType = entityTypeReflection.type;
 
     EntityHandler? entityHandler;
@@ -841,43 +838,33 @@ class Json {
     if (classification.isAllObj) {
       list = value;
     } else if (classification.isAllMap) {
-      list =
-          value
-              .map(
-                (m) =>
-                    m is Map<String, dynamic>
-                        ? entityHandler!.createFromMapSync(
-                          m,
-                          entityCache: entityCache,
-                        )
-                        : null,
-              )
-              .toList();
+      list = value
+          .map(
+            (m) => m is Map<String, dynamic>
+                ? entityHandler!.createFromMapSync(m, entityCache: entityCache)
+                : null,
+          )
+          .toList();
     } else if (classification.isAllID) {
-      list =
-          value.map((id) {
-            if (id == null) return null;
-            var o = entityCache.getCachedEntityByID(id, type: entityType);
-            return o;
-          }).toList();
+      list = value.map((id) {
+        if (id == null) return null;
+        var o = entityCache.getCachedEntityByID(id, type: entityType);
+        return o;
+      }).toList();
     } else if (classification.isAllNullOrEmpty) {
       list = value;
     } else {
-      list =
-          value.map((e) {
-            if (e == null) {
-              return null;
-            } else if (e is Map<String, dynamic>) {
-              return entityHandler!.createFromMapSync(
-                e,
-                entityCache: entityCache,
-              );
-            } else if ((e as Object).isEntityIDPrimitiveType) {
-              return entityCache.getCachedEntityByID(e, type: entityType);
-            } else {
-              return e;
-            }
-          }).toList();
+      list = value.map((e) {
+        if (e == null) {
+          return null;
+        } else if (e is Map<String, dynamic>) {
+          return entityHandler!.createFromMapSync(e, entityCache: entityCache);
+        } else if ((e as Object).isEntityIDPrimitiveType) {
+          return entityCache.getCachedEntityByID(e, type: entityType);
+        } else {
+          return e;
+        }
+      }).toList();
     }
 
     return classification.hasNull
diff --git a/lib/src/bones_api_utils_timedmap.dart b/lib/src/bones_api_utils_timedmap.dart
index 2ce2f444..4682cdac 100644
--- a/lib/src/bones_api_utils_timedmap.dart
+++ b/lib/src/bones_api_utils_timedmap.dart
@@ -90,11 +90,10 @@ class TimedMap<K, V> implements Map<K, V> {
 
   /// Returns the values of this instance checking [keyTimeout].
   /// See [checkAllEntries].
-  List<V> valuesChecked({DateTime? now, Duration? keyTimeout}) =>
-      keysChecked(
-        now: now,
-        keyTimeout: keyTimeout,
-      ).map((k) => _entries[k]!).toList();
+  List<V> valuesChecked({DateTime? now, Duration? keyTimeout}) => keysChecked(
+    now: now,
+    keyTimeout: keyTimeout,
+  ).map((k) => _entries[k]!).toList();
 
   /// Returns the entries of this instance checking [keyTimeout].
   /// See [checkAllEntries].
diff --git a/pubspec.yaml b/pubspec.yaml
index 3e3951be..740a1e1a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
 name: bones_api
 description: Bones_API - A powerful API backend framework for Dart. It comes with a built-in HTTP Server, route handler, entity handler, SQL translator, and DB adapters.
-version: 1.13.0
+version: 1.14.0
 homepage: https://github.com/Colossus-Services/bones_api
 
 environment:
-  sdk: '>=3.7.0 <4.0.0'
+  sdk: '>=3.10.0 <4.0.0'
 
 executables:
   bones_api:
@@ -40,6 +40,7 @@ dependencies:
   mime: ^2.0.0
   postgres: ^3.5.9
   mysql1: ^0.20.0
+  sqlite3: ^3.5.1
   gcloud: ^0.8.19
   yaml: ^3.1.3
   crypto: ^3.0.7
diff --git a/test/bones_api_condition_test.dart b/test/bones_api_condition_test.dart
index 2ac742eb..904ed60b 100644
--- a/test/bones_api_condition_test.dart
+++ b/test/bones_api_condition_test.dart
@@ -720,10 +720,12 @@ class _TestSchemeProvider extends SchemeProvider {
     String? entityName,
     String? tableName,
   }) {
-    var tableScheme =
-        tableName != null ? getTableScheme(tableName) as TableScheme? : null;
-    tableScheme ??=
-        entityName != null ? getTableScheme(entityName) as TableScheme? : null;
+    var tableScheme = tableName != null
+        ? getTableScheme(tableName) as TableScheme?
+        : null;
+    tableScheme ??= entityName != null
+        ? getTableScheme(entityName) as TableScheme?
+        : null;
 
     var fieldsType = tableScheme?.fieldsTypes[field];
     if (fieldsType != null) return TypeInfo.from(fieldsType);
diff --git a/test/bones_api_entity_db_directory_test.dart b/test/bones_api_entity_db_directory_test.dart
index 972f88b3..88b6bf35 100644
--- a/test/bones_api_entity_db_directory_test.dart
+++ b/test/bones_api_entity_db_directory_test.dart
@@ -117,13 +117,14 @@ Future<bool> _runTest(bool useReflection, bool populateSource) {
         populateSourceVariables: populate?['variables'],
       );
     },
-    (provider, dbPort, dbConfig) => DBObjectDirectoryAdapter(
-        tempObjectDir,
-        parentRepositoryProvider: provider,
-      )
-      ..onClose.listen((_) {
-        tempObjectDir.deleteSync(recursive: true);
-      }),
+    (provider, dbPort, dbConfig) =>
+        DBObjectDirectoryAdapter(
+            tempObjectDir,
+            parentRepositoryProvider: provider,
+          )
+          ..onClose.listen((_) {
+            tempObjectDir.deleteSync(recursive: true);
+          }),
     '"',
     'int',
     entityByReflection: useReflection,
diff --git a/test/bones_api_entity_db_sql_select_test.dart b/test/bones_api_entity_db_sql_select_test.dart
index d68da193..e7bacbec 100644
--- a/test/bones_api_entity_db_sql_select_test.dart
+++ b/test/bones_api_entity_db_sql_select_test.dart
@@ -662,11 +662,10 @@ void main() {
       expect(await p.loadAll(), equals(5));
       expect(p.loadedEntities.map((e) => e.id).toList(), equals(ids));
 
-      var streamed =
-          await roleRepository
-              .paginateByQuery(' id >= ? ', parameters: [ids.first], limit: 2)
-              .stream()
-              .toList();
+      var streamed = await roleRepository
+          .paginateByQuery(' id >= ? ', parameters: [ids.first], limit: 2)
+          .stream()
+          .toList();
       expect(streamed.map((e) => e.id).toList(), equals(ids));
 
       // A query matching nothing resolves as empty:
diff --git a/test/bones_api_entity_db_sqlite_test.dart b/test/bones_api_entity_db_sqlite_test.dart
new file mode 100644
index 00000000..596d4fc6
--- /dev/null
+++ b/test/bones_api_entity_db_sqlite_test.dart
@@ -0,0 +1,90 @@
+@TestOn('vm')
+@Tags(['sqlite', 'entities', 'slow'])
+@Timeout(Duration(minutes: 10))
+library;
+
+import 'package:bones_api/bones_api_db_sqlite.dart';
+import 'package:bones_api/bones_api_test_sqlite.dart';
+import 'package:test/test.dart';
+
+import 'bones_api_entity_db_tests_base.dart';
+
+class SQLiteTestConfig extends APITestConfigSQLite {
+  @override
+  String get runtimeTypeNameSafe => 'SQLiteTestConfig';
+
+  SQLiteTestConfig({
+    required bool generateTables,
+    required bool checkTables,
+    required bool memory,
+  }) : super({
+         'db': {
+           'sqlite': {
+             'port': 0,
+             'memory': memory,
+             'generateTables': generateTables,
+             'checkTables': checkTables,
+           },
+         },
+       }, memory: memory);
+}
+
+Future<void> main() async {
+  // A file database, over the same matrix used by the PostgreSQL/MySQL tests:
+  await _runTest(false, false, false, false, memory: false);
+  await _runTest(true, false, false, false, memory: false);
+
+  await _runTest(true, true, false, false, memory: false);
+  await _runTest(true, true, true, false, memory: false);
+  await _runTest(true, true, true, true, memory: false);
+
+  // And an in-memory database:
+  await _runTest(true, true, true, false, memory: true);
+  await _runTest(false, true, true, true, memory: true);
+}
+
+Future<bool> _runTest(
+  bool useReflection,
+  bool generateTables,
+  bool checkTables,
+  bool populateSource, {
+  required bool memory,
+}) {
+  var testConfig = SQLiteTestConfig(
+    generateTables: generateTables,
+    checkTables: checkTables,
+    memory: memory,
+  );
+
+  return runAdapterTests(
+    'SQLite${memory ? '+memory' : '+file'}',
+    testConfig,
+    (provider, dbPort, dbConfig) {
+      var populate = dbConfig?['populate'] as Map?;
+      var sqliteConfig = dbConfig?['sqlite'] as Map?;
+
+      var adapter = DBSQLiteAdapter(
+        sqliteConfig?['path']?.toString() ?? ':memory:',
+        parentRepositoryProvider: provider,
+        generateTables: generateTables,
+        checkTables: checkTables,
+        populateSource: populate?['source'],
+        populateSourceVariables: populate?['variables'],
+      );
+
+      // `runSQL`/`listTables` must reach the same database — mandatory for an
+      // in-memory one, whose handle is private to the adapter.
+      testConfig.sqlAdapter = adapter;
+
+      return adapter;
+    },
+    (provider, dbPort, dbConfig) =>
+        DBObjectMemoryAdapter(parentRepositoryProvider: provider),
+    '"',
+    'integer',
+    entityByReflection: useReflection,
+    generateTables: generateTables,
+    checkTables: checkTables,
+    populateSource: populateSource,
+  );
+}
diff --git a/test/bones_api_entity_db_tests_base.dart b/test/bones_api_entity_db_tests_base.dart
index 82b76f58..ca2e86f0 100644
--- a/test/bones_api_entity_db_tests_base.dart
+++ b/test/bones_api_entity_db_tests_base.dart
@@ -78,36 +78,31 @@ class TestEntityRepositoryProvider extends DBSQLEntityRepositoryProvider {
   List<DBSQLEntityRepository<Object>> buildRepositories(
     DBSQLAdapter<Object> adapter,
   ) {
-    return _repositories ??=
-        [
-          DBSQLEntityRepository<Store>(adapter, 'store', storeEntityHandler),
-          DBSQLEntityRepository<Address>(
-            adapter,
-            'address',
-            addressEntityHandler,
-          ),
-          DBSQLEntityRepository<Role>(adapter, 'role', roleEntityHandler),
-          DBSQLEntityRepository<UserInfo>(
-            adapter,
-            'user_info',
-            userInfoEntityHandler,
-          ),
-          DBSQLEntityRepository<User>(adapter, 'user', userEntityHandler),
-          // Order-related tables
-          DBSQLEntityRepository<CampaignConfig>(
-            adapter,
-            'campaign_config',
-            campaignConfigEntityHandler,
-          ),
-          DBSQLEntityRepository<Campaign>(
-            adapter,
-            'campaign',
-            campaignEntityHandler,
-          ),
-          DBSQLEntityRepository<Bonus>(adapter, 'bonus', bonusEntityHandler),
-          DBSQLEntityRepository<Item>(adapter, 'item', itemEntityHandler),
-          DBSQLEntityRepository<Order>(adapter, 'order', orderEntityHandler),
-        ].asUnmodifiableListView();
+    return _repositories ??= [
+      DBSQLEntityRepository<Store>(adapter, 'store', storeEntityHandler),
+      DBSQLEntityRepository<Address>(adapter, 'address', addressEntityHandler),
+      DBSQLEntityRepository<Role>(adapter, 'role', roleEntityHandler),
+      DBSQLEntityRepository<UserInfo>(
+        adapter,
+        'user_info',
+        userInfoEntityHandler,
+      ),
+      DBSQLEntityRepository<User>(adapter, 'user', userEntityHandler),
+      // Order-related tables
+      DBSQLEntityRepository<CampaignConfig>(
+        adapter,
+        'campaign_config',
+        campaignConfigEntityHandler,
+      ),
+      DBSQLEntityRepository<Campaign>(
+        adapter,
+        'campaign',
+        campaignEntityHandler,
+      ),
+      DBSQLEntityRepository<Bonus>(adapter, 'bonus', bonusEntityHandler),
+      DBSQLEntityRepository<Item>(adapter, 'item', itemEntityHandler),
+      DBSQLEntityRepository<Order>(adapter, 'order', orderEntityHandler),
+    ].asUnmodifiableListView();
   }
 
   @override
@@ -155,10 +150,9 @@ class TestEntityRepositoryProvider2 extends DBEntityRepositoryProvider {
   List<DBEntityRepository<Object>> buildRepositories(
     DBAdapter<Object> adapter,
   ) {
-    return _repositories ??=
-        [
-          DBEntityRepository<Photo>(adapter, 'photo', photoEntityHandler),
-        ].asUnmodifiableListView();
+    return _repositories ??= [
+      DBEntityRepository<Photo>(adapter, 'photo', photoEntityHandler),
+    ].asUnmodifiableListView();
   }
 
   @override
@@ -172,58 +166,56 @@ TestEntityRepositoryProvider createEntityRepositoryProvider(
   DBAdapterCreator<DBSQLAdapter> sqlAdapterCreator,
   int dbPort,
   Map<String, dynamic>? dbConfig,
-) =>
-    entityByReflection
-        ? TestEntityRepositoryProvider(
-          Store$reflection().entityHandler,
-          Address$reflection().entityHandler,
-          Role$reflection().entityHandler,
-          UserInfo$reflection().entityHandler,
-          User$reflection().entityHandler,
-          CampaignConfig$reflection().entityHandler,
-          Campaign$reflection().entityHandler,
-          Bonus$reflection().entityHandler,
-          Item$reflection().entityHandler,
-          Order$reflection().entityHandler,
-          sqlAdapterCreator,
-          dbPort,
-          dbConfig,
-        )
-        : TestEntityRepositoryProvider(
-          storeEntityHandler..inspectObject(Store.empty()),
-          addressEntityHandler..inspectObject(Address.empty()),
-          roleEntityHandler..inspectObject(Role.empty()),
-          userInfoEntityHandler..inspectObject(UserInfo.empty()),
-          userEntityHandler..inspectObject(User.empty()),
-          campaignConfigEntityHandler..inspectObject(CampaignConfig.empty()),
-          campaignEntityHandler..inspectObject(Campaign.empty()),
-          bonusEntityHandler..inspectObject(Bonus.empty()),
-          itemEntityHandler..inspectObject(Item.empty()),
-          orderEntityHandler..inspectObject(Order.empty()),
-          sqlAdapterCreator,
-          dbPort,
-          dbConfig,
-        );
+) => entityByReflection
+    ? TestEntityRepositoryProvider(
+        Store$reflection().entityHandler,
+        Address$reflection().entityHandler,
+        Role$reflection().entityHandler,
+        UserInfo$reflection().entityHandler,
+        User$reflection().entityHandler,
+        CampaignConfig$reflection().entityHandler,
+        Campaign$reflection().entityHandler,
+        Bonus$reflection().entityHandler,
+        Item$reflection().entityHandler,
+        Order$reflection().entityHandler,
+        sqlAdapterCreator,
+        dbPort,
+        dbConfig,
+      )
+    : TestEntityRepositoryProvider(
+        storeEntityHandler..inspectObject(Store.empty()),
+        addressEntityHandler..inspectObject(Address.empty()),
+        roleEntityHandler..inspectObject(Role.empty()),
+        userInfoEntityHandler..inspectObject(UserInfo.empty()),
+        userEntityHandler..inspectObject(User.empty()),
+        campaignConfigEntityHandler..inspectObject(CampaignConfig.empty()),
+        campaignEntityHandler..inspectObject(Campaign.empty()),
+        bonusEntityHandler..inspectObject(Bonus.empty()),
+        itemEntityHandler..inspectObject(Item.empty()),
+        orderEntityHandler..inspectObject(Order.empty()),
+        sqlAdapterCreator,
+        dbPort,
+        dbConfig,
+      );
 
 TestEntityRepositoryProvider2 createEntityRepositoryProvider2(
   bool entityByReflection,
   DBAdapterCreator<DBAdapter> objectAdapterCreator,
   int dbPort,
   Map<String, dynamic>? dbConfig,
-) =>
-    entityByReflection
-        ? TestEntityRepositoryProvider2(
-          Photo$reflection().entityHandler,
-          objectAdapterCreator,
-          dbPort,
-          dbConfig,
-        )
-        : TestEntityRepositoryProvider2(
-          photoEntityHandler..inspectObject(Photo.empty()),
-          objectAdapterCreator,
-          dbPort,
-          dbConfig,
-        );
+) => entityByReflection
+    ? TestEntityRepositoryProvider2(
+        Photo$reflection().entityHandler,
+        objectAdapterCreator,
+        dbPort,
+        dbConfig,
+      )
+    : TestEntityRepositoryProvider2(
+        photoEntityHandler..inspectObject(Photo.empty()),
+        objectAdapterCreator,
+        dbPort,
+        dbConfig,
+      );
 
 const String png1PixelBase64 =
     'R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==';
@@ -376,10 +368,13 @@ Future<bool> runAdapterTests(
         var reS = r'(?:\s+|--[^\n]+\n?)+';
         var reAnyType = r'\w+[^\n]*?';
         var reArg = r'(?:\([^ \t\(\)]+\))';
+        // SQLite declares an auto-assigning ID as `INTEGER PRIMARY KEY
+        // AUTOINCREMENT` (it has no `SERIAL`/`AUTO_INCREMENT`).
+        var rePK = r'PRIMARY KEY(?:\s+AUTOINCREMENT)?';
 
         var tableAddressRegexp = RegExp(
           'CREATE TABLE IF NOT EXISTS ${q}address$q \\($reS'
-          '${q}id$q $reAnyType PRIMARY KEY,$reS'
+          '${q}id$q $reAnyType $rePK,$reS'
           '${q}city$q VARCHAR$reArg?,$reS'
           '${q}latitude$q DECIMAL$reArg?,$reS'
           '${q}longitude$q DECIMAL$reArg?,$reS'
@@ -412,7 +407,7 @@ Future<bool> runAdapterTests(
 
         var tableRoleRegexp = RegExp(
           'CREATE TABLE IF NOT EXISTS ${q}role$q \\($reS'
-          '${q}id$q $reAnyType PRIMARY KEY,$reS'
+          '${q}id$q $reAnyType $rePK,$reS'
           '${q}enabled$q BOOLEAN,$reS'
           '${q}type$q $reAnyType,$reS'
           '${q}value$q DECIMAL$reArg?$reS'
@@ -427,7 +422,7 @@ Future<bool> runAdapterTests(
 
         var tableUserRegexp = RegExp(
           'CREATE TABLE IF NOT EXISTS ${q}user$q \\(\\s*'
-          '${q}id$q $reAnyType PRIMARY KEY,\\s*'
+          '${q}id$q $reAnyType $rePK,\\s*'
           '${q}address$q BIGINT[^,\\n]*?,\\s*'
           '${q}creation_time$q TIMESTAMP,\\s*'
           '${q}email$q VARCHAR$reArg?,\\s*'
@@ -1220,18 +1215,16 @@ Future<bool> runAdapterTests(
           var user2 = await userAPIRepository.selectByEmail('joe@$testDomain');
           expect(user2!.toJsonEncoded(), equals(user.toJsonEncoded()));
 
-          var user3 =
-              (await userAPIRepository.select(
-                Condition.parse('email == ?'),
-                parameters: ['joe@$testDomain'],
-              )).first;
+          var user3 = (await userAPIRepository.select(
+            Condition.parse('email == ?'),
+            parameters: ['joe@$testDomain'],
+          )).first;
           expect(user3.toJsonEncoded(), equals(user.toJsonEncoded()));
 
-          var user4 =
-              (await userAPIRepository.select(
-                Condition.parse('email == ?'),
-                parameters: ['joex@$testDomain'],
-              )).firstOrNull;
+          var user4 = (await userAPIRepository.select(
+            Condition.parse('email == ?'),
+            parameters: ['joex@$testDomain'],
+          )).firstOrNull;
           expect(user4, isNull);
         }
 
@@ -2269,8 +2262,9 @@ Future<bool> runAdapterTests(
           await orderRepo.store(otherOrder);
 
           // Query orders by campaign id using multi-level chain
-          var results =
-              (await orderRepo.selectByCampaignId(campaignId)).toList();
+          var results = (await orderRepo.selectByCampaignId(
+            campaignId,
+          )).toList();
           var numbers = results.map((o) => o.orderNumber).toList();
 
           expect(numbers, contains('ORD-CHAIN-001'));
@@ -2330,11 +2324,10 @@ Future<bool> runAdapterTests(
             expect(orderClosedId, isNotNull);
 
             // Query orders where items.bonus.campaign.config.open == true
-            var results =
-                (await orderRepo.selectByQuery(
-                  ' items.bonus.campaign.config.open == ? ',
-                  parameters: [true],
-                )).toList();
+            var results = (await orderRepo.selectByQuery(
+              ' items.bonus.campaign.config.open == ? ',
+              parameters: [true],
+            )).toList();
 
             var numbers = results.map((o) => o.orderNumber).toList();
             expect(numbers, contains('ORD-CONFIG-001'));
@@ -2754,11 +2747,10 @@ Future<bool> runAdapterTests(
         );
 
         // Streaming walks every entry, in order:
-        var streamed =
-            await campaignRepo
-                .paginateByQuery(' id >= ? ', parameters: [ids.first], limit: 2)
-                .stream()
-                .toList();
+        var streamed = await campaignRepo
+            .paginateByQuery(' id >= ? ', parameters: [ids.first], limit: 2)
+            .stream()
+            .toList();
         expect(streamed.map((e) => e.id).toList(), equals(ids));
 
         // A query matching nothing resolves as empty:
diff --git a/test/bones_api_entity_pagination_test.dart b/test/bones_api_entity_pagination_test.dart
index f96c574f..eadb0f3a 100644
--- a/test/bones_api_entity_pagination_test.dart
+++ b/test/bones_api_entity_pagination_test.dart
@@ -56,22 +56,21 @@ class _EventLog {
 
   void call(EntityPaginationEvent<_Item> event) => events.add(event);
 
-  List<String> get trace =>
-      events.map((e) {
-        return switch (e) {
-          EntityPaginationPageLoading(:var page) => 'loading:$page',
-          EntityPaginationPageLoaded(:var page, :var entriesLength) =>
-            'loaded:$page($entriesLength)',
-          EntityPaginationPageError(:var page) => 'error:$page',
-          EntityPaginationPageSkipped(:var page, :var reason) =>
-            'skipped:$page(${reason.name})',
-          EntityPaginationEnd(:var finalPage, :var totalLength) =>
-            'end:$finalPage($totalLength)',
-          EntityPaginationReset(:var discardedPages, :var isRefresh) =>
-            '${isRefresh ? 'refresh' : 'reset'}:'
-                '(${discardedPages.join(',')})',
-        };
-      }).toList();
+  List<String> get trace => events.map((e) {
+    return switch (e) {
+      EntityPaginationPageLoading(:var page) => 'loading:$page',
+      EntityPaginationPageLoaded(:var page, :var entriesLength) =>
+        'loaded:$page($entriesLength)',
+      EntityPaginationPageError(:var page) => 'error:$page',
+      EntityPaginationPageSkipped(:var page, :var reason) =>
+        'skipped:$page(${reason.name})',
+      EntityPaginationEnd(:var finalPage, :var totalLength) =>
+        'end:$finalPage($totalLength)',
+      EntityPaginationReset(:var discardedPages, :var isRefresh) =>
+        '${isRefresh ? 'refresh' : 'reset'}:'
+            '(${discardedPages.join(',')})',
+    };
+  }).toList();
 }
 
 void main() {
@@ -785,8 +784,9 @@ void main() {
 
       await expectLater(p.loadPage(1), throwsA(isA<StateError>()));
 
-      var error =
-          log.events.whereType<EntityPaginationPageError<_Item>>().single;
+      var error = log.events
+          .whereType<EntityPaginationPageError<_Item>>()
+          .single;
       expect(error.page, equals(1));
       expect(error.error, isA<StateError>());
       expect(error.stackTrace, isNotNull);
@@ -817,8 +817,9 @@ void main() {
 
       await p.loadPage(3);
 
-      var loaded =
-          log.events.whereType<EntityPaginationPageLoaded<_Item>>().single;
+      var loaded = log.events
+          .whereType<EntityPaginationPageLoaded<_Item>>()
+          .single;
 
       expect(_ids(loaded.entries), equals([20, 21, 22, 23, 24]));
       expect(loaded.entriesLength, equals(5));
diff --git a/test/bones_api_entity_reflection_test.dart b/test/bones_api_entity_reflection_test.dart
index 0ae79d7c..7690ea4b 100644
--- a/test/bones_api_entity_reflection_test.dart
+++ b/test/bones_api_entity_reflection_test.dart
@@ -166,13 +166,12 @@ void main() {
 
         var json = account.toJson();
 
-        var account2 =
-            Account$reflection.staticInstance
-                .createInstanceWithConstructorByName(
-                  'entityReference',
-                  json,
-                  fieldValueResolver: fieldValueResolver,
-                )!;
+        var account2 = Account$reflection.staticInstance
+            .createInstanceWithConstructorByName(
+              'entityReference',
+              json,
+              fieldValueResolver: fieldValueResolver,
+            )!;
 
         expect(account2.userInfo.isNull, isFalse);
         expect(account2.toJson(), equals(json));
@@ -185,13 +184,12 @@ void main() {
 
         var json = account.toJson();
 
-        var account2 =
-            Account$reflection.staticInstance
-                .createInstanceWithConstructorByName(
-                  'entityReference',
-                  json,
-                  fieldValueResolver: fieldValueResolver,
-                )!;
+        var account2 = Account$reflection.staticInstance
+            .createInstanceWithConstructorByName(
+              'entityReference',
+              json,
+              fieldValueResolver: fieldValueResolver,
+            )!;
 
         expect(account2.userInfo.isNull, isTrue);
         expect(account2.toJson(), equals(json));
diff --git a/test/bones_api_entity_rules_test.dart b/test/bones_api_entity_rules_test.dart
index ebc71fa8..449567b6 100644
--- a/test/bones_api_entity_rules_test.dart
+++ b/test/bones_api_entity_rules_test.dart
@@ -311,12 +311,11 @@ void main() {
       var j1 =
           Json.toJson(
                 user1,
-                toEncodableProvider:
-                    (o) => r1.toJsonEncodable(
-                      apiRequest,
-                      Json.defaultToEncodableJsonProvider(),
-                      o,
-                    ),
+                toEncodableProvider: (o) => r1.toJsonEncodable(
+                  apiRequest,
+                  Json.defaultToEncodableJsonProvider(),
+                  o,
+                ),
               )
               as Map;
 
@@ -327,12 +326,11 @@ void main() {
       var j2 =
           Json.toJson(
                 user2,
-                toEncodableProvider:
-                    (o) => r1.toJsonEncodable(
-                      apiRequest,
-                      Json.defaultToEncodableJsonProvider(),
-                      o,
-                    ),
+                toEncodableProvider: (o) => r1.toJsonEncodable(
+                  apiRequest,
+                  Json.defaultToEncodableJsonProvider(),
+                  o,
+                ),
               )
               as Map;
 
@@ -415,12 +413,11 @@ void main() {
       var j1 =
           Json.toJson(
                 user1,
-                toEncodableProvider:
-                    (o) => r1.toJsonEncodable(
-                      apiRequest,
-                      Json.defaultToEncodableJsonProvider(),
-                      o,
-                    ),
+                toEncodableProvider: (o) => r1.toJsonEncodable(
+                  apiRequest,
+                  Json.defaultToEncodableJsonProvider(),
+                  o,
+                ),
               )
               as Map;
 
@@ -431,12 +428,11 @@ void main() {
       var j2 =
           Json.toJson(
                 user2,
-                toEncodableProvider:
-                    (o) => r1.toJsonEncodable(
-                      apiRequest,
-                      Json.defaultToEncodableJsonProvider(),
-                      o,
-                    ),
+                toEncodableProvider: (o) => r1.toJsonEncodable(
+                  apiRequest,
+                  Json.defaultToEncodableJsonProvider(),
+                  o,
+                ),
               )
               as Map;
 
@@ -521,12 +517,11 @@ void main() {
       var j1 =
           Json.toJson(
                 user1,
-                toEncodableProvider:
-                    (o) => r1.toJsonEncodable(
-                      apiRequest,
-                      Json.defaultToEncodableJsonProvider(),
-                      o,
-                    ),
+                toEncodableProvider: (o) => r1.toJsonEncodable(
+                  apiRequest,
+                  Json.defaultToEncodableJsonProvider(),
+                  o,
+                ),
               )
               as Map;
 
@@ -537,12 +532,11 @@ void main() {
       var j2 =
           Json.toJson(
                 user2,
-                toEncodableProvider:
-                    (o) => r1.toJsonEncodable(
-                      apiRequest,
-                      Json.defaultToEncodableJsonProvider(),
-                      o,
-                    ),
+                toEncodableProvider: (o) => r1.toJsonEncodable(
+                  apiRequest,
+                  Json.defaultToEncodableJsonProvider(),
+                  o,
+                ),
               )
               as Map;
 
diff --git a/test/bones_api_entity_select_order_test.dart b/test/bones_api_entity_select_order_test.dart
index 2fde10e6..c76db38b 100644
--- a/test/bones_api_entity_select_order_test.dart
+++ b/test/bones_api_entity_select_order_test.dart
@@ -356,6 +356,12 @@ void main() {
       expect(postgres.offsetRequiresLimit, isFalse);
       expect(mysql.offsetRequiresLimit, isTrue);
       expect(generic.offsetMaxLimitValue, equals('18446744073709551615'));
+
+      // `RETURNING "alias".*` is the pre-existing behavior and must stay the
+      // default: only SQLite opts out of the table-qualified wildcard.
+      for (var d in [generic, postgres, mysql]) {
+        expect(d.returningAcceptsTableWildcard, isTrue, reason: d.name);
+      }
     });
 
     test('limitOffsetSQL: no clause', () {
diff --git a/test/bones_api_entity_test.dart b/test/bones_api_entity_test.dart
index 686ce07e..2e2e60bf 100644
--- a/test/bones_api_entity_test.dart
+++ b/test/bones_api_entity_test.dart
@@ -24,109 +24,113 @@ class APIEntityRepositoryProvider extends EntityRepositoryProvider {
   late final UserAPIRepository userAPIRepository;
 
   APIEntityRepositoryProvider._() {
-    sqlAdapter = DBSQLMemoryAdapter(
-      parentRepositoryProvider: this,
-    )..addTableSchemes([
-      TableScheme(
-        'user_info',
-        idFieldName: 'id',
-        fieldsTypes: {'id': int, 'info': String},
-      ),
-      TableScheme(
-        'user',
-        idFieldName: 'id',
-        fieldsTypes: {
-          'id': int,
-          'email': String,
-          'password': String,
-          'address': int,
-          'level': int,
-          'wake_up_time': Time,
-          'creation_time': DateTime,
-        },
-        fieldsReferencedTables: {
-          'address': TableFieldReference(
-            'user',
-            'address',
-            int,
-            'address',
-            'id',
-            int,
-          ),
-          'user_info': TableFieldReference(
-            'user',
-            'user_info',
-            int,
-            'user_info',
-            'id',
-            int,
-          ),
-        },
-        relationshipTables: [
-          TableRelationshipReference(
-            'user__roles__rel',
-            'user',
-            'id',
-            int,
-            'user_id',
-            'role',
-            'id',
-            int,
-            'role_id',
-          ),
-        ],
-      ),
-      TableScheme(
-        'address',
-        idFieldName: 'id',
-        fieldsTypes: {
-          'id': int,
-          'state': String,
-          'city': String,
-          'street': String,
-          'number': int,
-        },
-        relationshipTables: [
-          TableRelationshipReference(
-            'address__stores__rel',
-            'address',
-            'id',
-            int,
-            'address_id',
-            'store',
-            'id',
-            int,
-            'store_id',
-          ),
-          TableRelationshipReference(
-            'address__closed_stores__rel',
-            'address',
-            'id',
-            int,
-            'address_id',
-            'store',
-            'id',
-            int,
-            'store_id',
-          ),
-        ],
-      ),
-      TableScheme(
-        'store',
-        idFieldName: 'id',
-        fieldsTypes: {'id': int, 'name': String, 'number': int, 'owner': User},
-      ),
-      TableScheme(
-        'role',
-        idFieldName: 'id',
-        fieldsTypes: {
-          'id': int,
-          'type': String,
-          'enabled': bool,
-          'value': Decimal,
-        },
-      ),
-    ]);
+    sqlAdapter = DBSQLMemoryAdapter(parentRepositoryProvider: this)
+      ..addTableSchemes([
+        TableScheme(
+          'user_info',
+          idFieldName: 'id',
+          fieldsTypes: {'id': int, 'info': String},
+        ),
+        TableScheme(
+          'user',
+          idFieldName: 'id',
+          fieldsTypes: {
+            'id': int,
+            'email': String,
+            'password': String,
+            'address': int,
+            'level': int,
+            'wake_up_time': Time,
+            'creation_time': DateTime,
+          },
+          fieldsReferencedTables: {
+            'address': TableFieldReference(
+              'user',
+              'address',
+              int,
+              'address',
+              'id',
+              int,
+            ),
+            'user_info': TableFieldReference(
+              'user',
+              'user_info',
+              int,
+              'user_info',
+              'id',
+              int,
+            ),
+          },
+          relationshipTables: [
+            TableRelationshipReference(
+              'user__roles__rel',
+              'user',
+              'id',
+              int,
+              'user_id',
+              'role',
+              'id',
+              int,
+              'role_id',
+            ),
+          ],
+        ),
+        TableScheme(
+          'address',
+          idFieldName: 'id',
+          fieldsTypes: {
+            'id': int,
+            'state': String,
+            'city': String,
+            'street': String,
+            'number': int,
+          },
+          relationshipTables: [
+            TableRelationshipReference(
+              'address__stores__rel',
+              'address',
+              'id',
+              int,
+              'address_id',
+              'store',
+              'id',
+              int,
+              'store_id',
+            ),
+            TableRelationshipReference(
+              'address__closed_stores__rel',
+              'address',
+              'id',
+              int,
+              'address_id',
+              'store',
+              'id',
+              int,
+              'store_id',
+            ),
+          ],
+        ),
+        TableScheme(
+          'store',
+          idFieldName: 'id',
+          fieldsTypes: {
+            'id': int,
+            'name': String,
+            'number': int,
+            'owner': User,
+          },
+        ),
+        TableScheme(
+          'role',
+          idFieldName: 'id',
+          fieldsTypes: {
+            'id': int,
+            'type': String,
+            'enabled': bool,
+            'value': Decimal,
+          },
+        ),
+      ]);
 
     storeSQLRepository = DBSQLEntityRepository<Store>(
       sqlAdapter,
@@ -1623,17 +1627,16 @@ void main() {
         int? offset,
         bool? orderByID,
         OrderDirection? orderDirection,
-      }) =>
-          repository
-              .select(
-                ConditionANY(),
-                limit: limit,
-                offset: offset,
-                orderByID: orderByID,
-                orderDirection: orderDirection,
-              )
-              .map((e) => e.id)
-              .toList();
+      }) => repository
+          .select(
+            ConditionANY(),
+            limit: limit,
+            offset: offset,
+            orderByID: orderByID,
+            orderDirection: orderDirection,
+          )
+          .map((e) => e.id)
+          .toList();
 
       // Baseline: unchanged, no ordering applied.
       expect(selectIDs(), equals(ids));
diff --git a/test/bones_api_module_test.dart b/test/bones_api_module_test.dart
index ad0365d0..e03fbcd8 100644
--- a/test/bones_api_module_test.dart
+++ b/test/bones_api_module_test.dart
@@ -60,10 +60,9 @@ void main() {
       expect(userModule.allRoutesNames, equals({...userRoutes}));
 
       {
-        var apiRootInfoJson =
-            (await apiRoot.call(
-              APIRequest.get('/API-INFO'),
-            )).payloadAs<APIRootInfo>().toJson();
+        var apiRootInfoJson = (await apiRoot.call(
+          APIRequest.get('/API-INFO'),
+        )).payloadAs<APIRootInfo>().toJson();
 
         expect(
           Map.from(apiRootInfoJson)..remove('modules'),
@@ -81,10 +80,9 @@ void main() {
           List.from(apiRootInfoJson['modules'])
               .cast<Map>()
               .map(
-                (e) =>
-                    List.from(
-                      e['routes'],
-                    ).cast<Map>().map((e) => e['name']).toList(),
+                (e) => List.from(
+                  e['routes'],
+                ).cast<Map>().map((e) => e['name']).toList(),
               )
               .toList(),
           equals([aboutRoutes, userRoutes]),
@@ -92,10 +90,9 @@ void main() {
       }
 
       {
-        var apiRootInfoJson =
-            (await apiRoot.call(
-              APIRequest.get('/API-INFO/about'),
-            )).payloadAs<APIRootInfo>().toJson();
+        var apiRootInfoJson = (await apiRoot.call(
+          APIRequest.get('/API-INFO/about'),
+        )).payloadAs<APIRootInfo>().toJson();
 
         expect(
           Map.from(apiRootInfoJson)..remove('modules'),
@@ -113,10 +110,9 @@ void main() {
           List.from(apiRootInfoJson['modules'])
               .cast<Map>()
               .map(
-                (e) =>
-                    List.from(
-                      e['routes'],
-                    ).cast<Map>().map((e) => e['name']).toList(),
+                (e) => List.from(
+                  e['routes'],
+                ).cast<Map>().map((e) => e['name']).toList(),
               )
               .toList(),
           equals([aboutRoutes]),
@@ -124,10 +120,9 @@ void main() {
       }
 
       {
-        var apiRootInfoJson =
-            (await apiRoot.call(
-              APIRequest.get('/API-INFO/user'),
-            )).payloadAs<APIRootInfo>().toJson();
+        var apiRootInfoJson = (await apiRoot.call(
+          APIRequest.get('/API-INFO/user'),
+        )).payloadAs<APIRootInfo>().toJson();
 
         expect(
           Map.from(apiRootInfoJson)..remove('modules'),
@@ -145,10 +140,9 @@ void main() {
           List.from(apiRootInfoJson['modules'])
               .cast<Map>()
               .map(
-                (e) =>
-                    List.from(
-                      e['routes'],
-                    ).cast<Map>().map((e) => e['name']).toList(),
+                (e) => List.from(
+                  e['routes'],
+                ).cast<Map>().map((e) => e['name']).toList(),
               )
               .toList(),
           equals([userRoutes]),
@@ -589,11 +583,10 @@ Map<String, Object?> _buildTestUserJson(
     'roles': [],
     'level': null,
     'wakeUpTime': null,
-    'userInfo':
-        (userInfo == null)
-            ? null
-            : (userInfoRef
-                ? {
+    'userInfo': (userInfo == null)
+        ? null
+        : (userInfoRef
+              ? {
                   'EntityReference': 'UserInfo',
                   if (userInfoId != null) 'id': userInfoId,
                   'entity': {
@@ -601,7 +594,7 @@ Map<String, Object?> _buildTestUserJson(
                     'info': userInfo,
                   },
                 }
-                : {if (userInfoId != null) 'id': userInfoId, 'info': userInfo}),
+              : {if (userInfoId != null) 'id': userInfoId, 'info': userInfo}),
     'creationTime': 1665501194000,
   };
 }
diff --git a/test/bones_api_test.reflection.g.dart b/test/bones_api_test.reflection.g.dart
index 8eca4436..59e951a6 100644
--- a/test/bones_api_test.reflection.g.dart
+++ b/test/bones_api_test.reflection.g.dart
@@ -80,7 +80,7 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   MyInfoModule$reflection withObject([MyInfoModule? obj]) =>
@@ -257,7 +257,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<APIRoot>(APIRoot),
           'apiRoot',
           false,
-          (o) => () => o!.apiRoot,
+          (o) =>
+              () => o!.apiRoot,
           null,
           obj,
           true,
@@ -269,7 +270,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
+          (o) =>
+              () => o!.name,
           null,
           obj,
           true,
@@ -281,7 +283,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'version',
           true,
-          (o) => () => o!.version,
+          (o) =>
+              () => o!.version,
           null,
           obj,
           true,
@@ -293,7 +296,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<APIConfig>(APIConfig),
           'apiConfig',
           false,
-          (o) => () => o!.apiConfig,
+          (o) =>
+              () => o!.apiConfig,
           null,
           obj,
           false,
@@ -305,7 +309,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'defaultRouteName',
           true,
-          (o) => () => o!.defaultRouteName,
+          (o) =>
+              () => o!.defaultRouteName,
           null,
           obj,
           false,
@@ -317,7 +322,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tSetString,
           'allRoutesNames',
           false,
-          (o) => () => o!.allRoutesNames,
+          (o) =>
+              () => o!.allRoutesNames,
           null,
           obj,
           false,
@@ -331,7 +337,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           ]),
           'routes',
           false,
-          (o) => () => o!.routes,
+          (o) =>
+              () => o!.routes,
           null,
           obj,
           false,
@@ -343,7 +350,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'authenticationRoute',
           false,
-          (o) => () => o!.authenticationRoute,
+          (o) =>
+              () => o!.authenticationRoute,
           null,
           obj,
           false,
@@ -355,7 +363,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<APISecurity>(APISecurity),
           'security',
           true,
-          (o) => () => o!.security,
+          (o) =>
+              () => o!.security,
           null,
           obj,
           false,
@@ -367,7 +376,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -380,7 +390,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<InitializationStatus>(InitializationStatus),
           'initializationStatus',
           false,
-          (o) => () => o!.initializationStatus,
+          (o) =>
+              () => o!.initializationStatus,
           null,
           obj,
           false,
@@ -392,7 +403,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tBool,
           'isInitialized',
           false,
-          (o) => () => o!.isInitialized,
+          (o) =>
+              () => o!.isInitialized,
           null,
           obj,
           false,
@@ -404,7 +416,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tBool,
           'isInitializing',
           false,
-          (o) => () => o!.isInitializing,
+          (o) =>
+              () => o!.isInitializing,
           null,
           obj,
           false,
@@ -416,7 +429,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tBool,
           'isAsyncInitialization',
           false,
-          (o) => () => o!.isAsyncInitialization,
+          (o) =>
+              () => o!.isAsyncInitialization,
           null,
           obj,
           false,
@@ -1104,10 +1118,8 @@ List<Reflection> _listSiblingsReflection() => <Reflection>[
 ];
 
 List<Reflection>? _siblingsReflectionList;
-List<Reflection> _siblingsReflection() =>
-    _siblingsReflectionList ??= List<Reflection>.unmodifiable(
-      _listSiblingsReflection(),
-    );
+List<Reflection> _siblingsReflection() => _siblingsReflectionList ??=
+    List<Reflection>.unmodifiable(_listSiblingsReflection());
 
 bool _registerSiblingsReflectionCalled = false;
 void _registerSiblingsReflection() {
diff --git a/test/bones_api_test_entities.dart b/test/bones_api_test_entities.dart
index cc9de3aa..4184e649 100644
--- a/test/bones_api_test_entities.dart
+++ b/test/bones_api_test_entities.dart
@@ -564,10 +564,9 @@ class Photo extends Entity {
     if (o is Uint8List) return Photo.fromData(o, id: id);
 
     if (o is Map) {
-      var map =
-          o is Map<String, Object?>
-              ? o
-              : o.map((key, value) => MapEntry('$key', value));
+      var map = o is Map<String, Object?>
+          ? o
+          : o.map((key, value) => MapEntry('$key', value));
       return Photo.fromMap(map);
     }
 
diff --git a/test/bones_api_test_entities.reflection.g.dart b/test/bones_api_test_entities.reflection.g.dart
index 8924b8b7..46f483a8 100644
--- a/test/bones_api_test_entities.reflection.g.dart
+++ b/test/bones_api_test_entities.reflection.g.dart
@@ -132,7 +132,7 @@ class Account$reflection extends ClassReflection<Account>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Account$reflection withObject([Account? obj]) =>
@@ -335,8 +335,10 @@ class Account$reflection extends ClassReflection<Account>
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -347,8 +349,10 @@ class Account$reflection extends ClassReflection<Account>
           const __TR<User>(User),
           'user',
           false,
-          (o) => () => o!.user,
-          (o) => (v) => o!.user = v,
+          (o) =>
+              () => o!.user,
+          (o) =>
+              (v) => o!.user = v,
           obj,
           false,
         );
@@ -361,8 +365,10 @@ class Account$reflection extends ClassReflection<Account>
           ]),
           'userInfo',
           false,
-          (o) => () => o!.userInfo,
-          (o) => (v) => o!.userInfo = v,
+          (o) =>
+              () => o!.userInfo,
+          (o) =>
+              (v) => o!.userInfo = v,
           obj,
           false,
         );
@@ -373,7 +379,8 @@ class Account$reflection extends ClassReflection<Account>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -386,7 +393,8 @@ class Account$reflection extends ClassReflection<Account>
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -399,7 +407,8 @@ class Account$reflection extends ClassReflection<Account>
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -668,7 +677,7 @@ class Address$reflection extends ClassReflection<Address>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Address$reflection withObject([Address? obj]) =>
@@ -882,8 +891,10 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -894,8 +905,10 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tString,
           'state',
           false,
-          (o) => () => o!.state,
-          (o) => (v) => o!.state = v,
+          (o) =>
+              () => o!.state,
+          (o) =>
+              (v) => o!.state = v,
           obj,
           false,
           const [EntityField.indexed(), EntityField.maximum(3)],
@@ -907,8 +920,10 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tString,
           'city',
           false,
-          (o) => () => o!.city,
-          (o) => (v) => o!.city = v,
+          (o) =>
+              () => o!.city,
+          (o) =>
+              (v) => o!.city = v,
           obj,
           false,
           const [EntityField.maximum(100)],
@@ -920,8 +935,10 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tString,
           'street',
           false,
-          (o) => () => o!.street,
-          (o) => (v) => o!.street = v,
+          (o) =>
+              () => o!.street,
+          (o) =>
+              (v) => o!.street = v,
           obj,
           false,
           const [EntityField.maximum(200)],
@@ -933,8 +950,10 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tInt,
           'number',
           false,
-          (o) => () => o!.number,
-          (o) => (v) => o!.number = v,
+          (o) =>
+              () => o!.number,
+          (o) =>
+              (v) => o!.number = v,
           obj,
           false,
         );
@@ -945,8 +964,10 @@ class Address$reflection extends ClassReflection<Address>
           const __TR<Decimal>(Decimal),
           'latitude',
           false,
-          (o) => () => o!.latitude,
-          (o) => (v) => o!.latitude = v,
+          (o) =>
+              () => o!.latitude,
+          (o) =>
+              (v) => o!.latitude = v,
           obj,
           false,
         );
@@ -957,8 +978,10 @@ class Address$reflection extends ClassReflection<Address>
           const __TR<Decimal>(Decimal),
           'longitude',
           false,
-          (o) => () => o!.longitude,
-          (o) => (v) => o!.longitude = v,
+          (o) =>
+              () => o!.longitude,
+          (o) =>
+              (v) => o!.longitude = v,
           obj,
           false,
         );
@@ -969,8 +992,10 @@ class Address$reflection extends ClassReflection<Address>
           const __TR<List<Store>>(List, <__TR>[__TR<Store>(Store)]),
           'stores',
           false,
-          (o) => () => o!.stores,
-          (o) => (v) => o!.stores = v,
+          (o) =>
+              () => o!.stores,
+          (o) =>
+              (v) => o!.stores = v,
           obj,
           false,
         );
@@ -983,8 +1008,10 @@ class Address$reflection extends ClassReflection<Address>
           ]),
           'closedStores',
           false,
-          (o) => () => o!.closedStores,
-          (o) => (v) => o!.closedStores = v,
+          (o) =>
+              () => o!.closedStores,
+          (o) =>
+              (v) => o!.closedStores = v,
           obj,
           false,
         );
@@ -995,7 +1022,8 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -1008,7 +1036,8 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -1021,7 +1050,8 @@ class Address$reflection extends ClassReflection<Address>
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -1301,7 +1331,7 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Photo$reflection withObject([Photo? obj]) =>
@@ -1502,8 +1532,10 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
           __TR.tString,
           'id',
           false,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -1514,8 +1546,10 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
           const __TR<Uint8List>(Uint8List),
           'data',
           true,
-          (o) => () => o!.data,
-          (o) => (v) => o!.data = v,
+          (o) =>
+              () => o!.data,
+          (o) =>
+              (v) => o!.data = v,
           obj,
           false,
         );
@@ -1526,7 +1560,8 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
           __TR.tString,
           'dataUrl',
           true,
-          (o) => () => o!.dataUrl,
+          (o) =>
+              () => o!.dataUrl,
           null,
           obj,
           false,
@@ -1538,7 +1573,8 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -1551,7 +1587,8 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -1564,7 +1601,8 @@ class Photo$reflection extends ClassReflection<Photo> with __ReflectionMixin {
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -1893,7 +1931,7 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Role$reflection withObject([Role? obj]) =>
@@ -2086,8 +2124,10 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -2098,8 +2138,10 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           const __TR<RoleType>(RoleType),
           'type',
           false,
-          (o) => () => o!.type,
-          (o) => (v) => o!.type = v,
+          (o) =>
+              () => o!.type,
+          (o) =>
+              (v) => o!.type = v,
           obj,
           false,
         );
@@ -2110,8 +2152,10 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           __TR.tBool,
           'enabled',
           false,
-          (o) => () => o!.enabled,
-          (o) => (v) => o!.enabled = v,
+          (o) =>
+              () => o!.enabled,
+          (o) =>
+              (v) => o!.enabled = v,
           obj,
           false,
         );
@@ -2122,8 +2166,10 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           const __TR<Decimal>(Decimal),
           'value',
           true,
-          (o) => () => o!.value,
-          (o) => (v) => o!.value = v,
+          (o) =>
+              () => o!.value,
+          (o) =>
+              (v) => o!.value = v,
           obj,
           false,
         );
@@ -2134,7 +2180,8 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -2147,7 +2194,8 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -2160,7 +2208,8 @@ class Role$reflection extends ClassReflection<Role> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -2440,7 +2489,7 @@ class RoleType$reflection extends EnumReflection<RoleType>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   RoleType$reflection withObject([RoleType? obj]) => RoleType$reflection(obj);
@@ -2517,7 +2566,7 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Store$reflection withObject([Store? obj]) =>
@@ -2698,8 +2747,10 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -2710,8 +2761,10 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
-          (o) => (v) => o!.name = v,
+          (o) =>
+              () => o!.name,
+          (o) =>
+              (v) => o!.name = v,
           obj,
           false,
           const [EntityField.maximum(100)],
@@ -2723,8 +2776,10 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           __TR.tInt,
           'number',
           true,
-          (o) => () => o!.number,
-          (o) => (v) => o!.number = v,
+          (o) =>
+              () => o!.number,
+          (o) =>
+              (v) => o!.number = v,
           obj,
           false,
         );
@@ -2735,8 +2790,10 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           const __TR<User>(User),
           'owner',
           true,
-          (o) => () => o!.owner,
-          (o) => (v) => o!.owner = v,
+          (o) =>
+              () => o!.owner,
+          (o) =>
+              (v) => o!.owner = v,
           obj,
           false,
         );
@@ -2747,7 +2804,8 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -2760,7 +2818,8 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -2773,7 +2832,8 @@ class Store$reflection extends ClassReflection<Store> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -3073,7 +3133,7 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   User$reflection withObject([User? obj]) =>
@@ -3275,8 +3335,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -3287,8 +3349,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tString,
           'email',
           false,
-          (o) => () => o!.email,
-          (o) => (v) => o!.email = v,
+          (o) =>
+              () => o!.email,
+          (o) =>
+              (v) => o!.email = v,
           obj,
           false,
           const [
@@ -3304,8 +3368,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tString,
           'password',
           false,
-          (o) => () => o!.password,
-          (o) => (v) => o!.password = v,
+          (o) =>
+              () => o!.password,
+          (o) =>
+              (v) => o!.password = v,
           obj,
           false,
         );
@@ -3316,8 +3382,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           const __TR<Address>(Address),
           'address',
           false,
-          (o) => () => o!.address,
-          (o) => (v) => o!.address = v,
+          (o) =>
+              () => o!.address,
+          (o) =>
+              (v) => o!.address = v,
           obj,
           false,
         );
@@ -3328,8 +3396,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           const __TR<List<Role>>(List, <__TR>[__TR<Role>(Role)]),
           'roles',
           false,
-          (o) => () => o!.roles,
-          (o) => (v) => o!.roles = v,
+          (o) =>
+              () => o!.roles,
+          (o) =>
+              (v) => o!.roles = v,
           obj,
           false,
         );
@@ -3340,8 +3410,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tInt,
           'level',
           true,
-          (o) => () => o!.level,
-          (o) => (v) => o!.level = v,
+          (o) =>
+              () => o!.level,
+          (o) =>
+              (v) => o!.level = v,
           obj,
           false,
         );
@@ -3352,8 +3424,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           const __TR<Time>(Time),
           'wakeUpTime',
           true,
-          (o) => () => o!.wakeUpTime,
-          (o) => (v) => o!.wakeUpTime = v,
+          (o) =>
+              () => o!.wakeUpTime,
+          (o) =>
+              (v) => o!.wakeUpTime = v,
           obj,
           false,
         );
@@ -3366,8 +3440,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           ]),
           'userInfo',
           false,
-          (o) => () => o!.userInfo,
-          (o) => (v) => o!.userInfo = v,
+          (o) =>
+              () => o!.userInfo,
+          (o) =>
+              (v) => o!.userInfo = v,
           obj,
           false,
         );
@@ -3378,8 +3454,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           const __TR<Photo>(Photo),
           'photo',
           true,
-          (o) => () => o!.photo,
-          (o) => (v) => o!.photo = v,
+          (o) =>
+              () => o!.photo,
+          (o) =>
+              (v) => o!.photo = v,
           obj,
           false,
         );
@@ -3390,8 +3468,10 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           const __TR<DateTime>(DateTime),
           'creationTime',
           false,
-          (o) => () => o!.creationTime,
-          (o) => (v) => o!.creationTime = v,
+          (o) =>
+              () => o!.creationTime,
+          (o) =>
+              (v) => o!.creationTime = v,
           obj,
           false,
         );
@@ -3402,7 +3482,8 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -3415,7 +3496,8 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -3428,7 +3510,8 @@ class User$reflection extends ClassReflection<User> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -3754,7 +3837,7 @@ class UserInfo$reflection extends ClassReflection<UserInfo>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   UserInfo$reflection withObject([UserInfo? obj]) =>
@@ -3930,8 +4013,10 @@ class UserInfo$reflection extends ClassReflection<UserInfo>
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -3942,8 +4027,10 @@ class UserInfo$reflection extends ClassReflection<UserInfo>
           __TR.tString,
           'info',
           false,
-          (o) => () => o!.info,
-          (o) => (v) => o!.info = v,
+          (o) =>
+              () => o!.info,
+          (o) =>
+              (v) => o!.info = v,
           obj,
           false,
           const [EntityField.maximum(1000)],
@@ -3955,7 +4042,8 @@ class UserInfo$reflection extends ClassReflection<UserInfo>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -3968,7 +4056,8 @@ class UserInfo$reflection extends ClassReflection<UserInfo>
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -3981,7 +4070,8 @@ class UserInfo$reflection extends ClassReflection<UserInfo>
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -4399,10 +4489,8 @@ List<Reflection> _listSiblingsReflection() => <Reflection>[
 ];
 
 List<Reflection>? _siblingsReflectionList;
-List<Reflection> _siblingsReflection() =>
-    _siblingsReflectionList ??= List<Reflection>.unmodifiable(
-      _listSiblingsReflection(),
-    );
+List<Reflection> _siblingsReflection() => _siblingsReflectionList ??=
+    List<Reflection>.unmodifiable(_listSiblingsReflection());
 
 bool _registerSiblingsReflectionCalled = false;
 void _registerSiblingsReflection() {
diff --git a/test/bones_api_test_entities_orders.reflection.g.dart b/test/bones_api_test_entities_orders.reflection.g.dart
index 818db5ae..7f360761 100644
--- a/test/bones_api_test_entities_orders.reflection.g.dart
+++ b/test/bones_api_test_entities_orders.reflection.g.dart
@@ -102,7 +102,7 @@ class Bonus$reflection extends ClassReflection<Bonus> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Bonus$reflection withObject([Bonus? obj]) =>
@@ -277,8 +277,10 @@ class Bonus$reflection extends ClassReflection<Bonus> with __ReflectionMixin {
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -291,8 +293,10 @@ class Bonus$reflection extends ClassReflection<Bonus> with __ReflectionMixin {
           ]),
           'campaign',
           false,
-          (o) => () => o!.campaign,
-          (o) => (v) => o!.campaign = v,
+          (o) =>
+              () => o!.campaign,
+          (o) =>
+              (v) => o!.campaign = v,
           obj,
           false,
         );
@@ -303,7 +307,8 @@ class Bonus$reflection extends ClassReflection<Bonus> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -316,7 +321,8 @@ class Bonus$reflection extends ClassReflection<Bonus> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -614,7 +620,7 @@ class Campaign$reflection extends ClassReflection<Campaign>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Campaign$reflection withObject([Campaign? obj]) =>
@@ -793,8 +799,10 @@ class Campaign$reflection extends ClassReflection<Campaign>
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -805,8 +813,10 @@ class Campaign$reflection extends ClassReflection<Campaign>
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
-          (o) => (v) => o!.name = v,
+          (o) =>
+              () => o!.name,
+          (o) =>
+              (v) => o!.name = v,
           obj,
           false,
         );
@@ -819,8 +829,10 @@ class Campaign$reflection extends ClassReflection<Campaign>
           ]),
           'config',
           false,
-          (o) => () => o!.config,
-          (o) => (v) => o!.config = v,
+          (o) =>
+              () => o!.config,
+          (o) =>
+              (v) => o!.config = v,
           obj,
           false,
         );
@@ -831,7 +843,8 @@ class Campaign$reflection extends ClassReflection<Campaign>
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -844,7 +857,8 @@ class Campaign$reflection extends ClassReflection<Campaign>
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -1152,7 +1166,7 @@ class CampaignConfig$reflection extends ClassReflection<CampaignConfig>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   CampaignConfig$reflection withObject([CampaignConfig? obj]) =>
@@ -1339,8 +1353,10 @@ class CampaignConfig$reflection extends ClassReflection<CampaignConfig>
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -1351,8 +1367,10 @@ class CampaignConfig$reflection extends ClassReflection<CampaignConfig>
           __TR.tBool,
           'open',
           false,
-          (o) => () => o!.open,
-          (o) => (v) => o!.open = v,
+          (o) =>
+              () => o!.open,
+          (o) =>
+              (v) => o!.open = v,
           obj,
           false,
         );
@@ -1363,7 +1381,8 @@ class CampaignConfig$reflection extends ClassReflection<CampaignConfig>
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -1376,7 +1395,8 @@ class CampaignConfig$reflection extends ClassReflection<CampaignConfig>
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -1688,7 +1708,7 @@ class Item$reflection extends ClassReflection<Item> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Item$reflection withObject([Item? obj]) =>
@@ -1863,8 +1883,10 @@ class Item$reflection extends ClassReflection<Item> with __ReflectionMixin {
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -1875,8 +1897,10 @@ class Item$reflection extends ClassReflection<Item> with __ReflectionMixin {
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
-          (o) => (v) => o!.name = v,
+          (o) =>
+              () => o!.name,
+          (o) =>
+              (v) => o!.name = v,
           obj,
           false,
         );
@@ -1889,8 +1913,10 @@ class Item$reflection extends ClassReflection<Item> with __ReflectionMixin {
           ]),
           'bonus',
           false,
-          (o) => () => o!.bonus,
-          (o) => (v) => o!.bonus = v,
+          (o) =>
+              () => o!.bonus,
+          (o) =>
+              (v) => o!.bonus = v,
           obj,
           false,
         );
@@ -1901,7 +1927,8 @@ class Item$reflection extends ClassReflection<Item> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -1914,7 +1941,8 @@ class Item$reflection extends ClassReflection<Item> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -2209,7 +2237,7 @@ class Order$reflection extends ClassReflection<Order> with __ReflectionMixin {
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   Order$reflection withObject([Order? obj]) =>
@@ -2390,8 +2418,10 @@ class Order$reflection extends ClassReflection<Order> with __ReflectionMixin {
           __TR.tInt,
           'id',
           true,
-          (o) => () => o!.id,
-          (o) => (v) => o!.id = v,
+          (o) =>
+              () => o!.id,
+          (o) =>
+              (v) => o!.id = v,
           obj,
           false,
         );
@@ -2402,8 +2432,10 @@ class Order$reflection extends ClassReflection<Order> with __ReflectionMixin {
           __TR.tString,
           'orderNumber',
           false,
-          (o) => () => o!.orderNumber,
-          (o) => (v) => o!.orderNumber = v,
+          (o) =>
+              () => o!.orderNumber,
+          (o) =>
+              (v) => o!.orderNumber = v,
           obj,
           false,
         );
@@ -2414,8 +2446,10 @@ class Order$reflection extends ClassReflection<Order> with __ReflectionMixin {
           const __TR<List<Item>>(List, <__TR>[__TR<Item>(Item)]),
           'items',
           false,
-          (o) => () => o!.items,
-          (o) => (v) => o!.items = v,
+          (o) =>
+              () => o!.items,
+          (o) =>
+              (v) => o!.items = v,
           obj,
           false,
         );
@@ -2426,7 +2460,8 @@ class Order$reflection extends ClassReflection<Order> with __ReflectionMixin {
           __TR.tString,
           'idFieldName',
           false,
-          (o) => () => o!.idFieldName,
+          (o) =>
+              () => o!.idFieldName,
           null,
           obj,
           false,
@@ -2439,7 +2474,8 @@ class Order$reflection extends ClassReflection<Order> with __ReflectionMixin {
           __TR.tListString,
           'fieldsNames',
           false,
-          (o) => () => o!.fieldsNames,
+          (o) =>
+              () => o!.fieldsNames,
           null,
           obj,
           false,
@@ -2791,10 +2827,8 @@ List<Reflection> _listSiblingsReflection() => <Reflection>[
 ];
 
 List<Reflection>? _siblingsReflectionList;
-List<Reflection> _siblingsReflection() =>
-    _siblingsReflectionList ??= List<Reflection>.unmodifiable(
-      _listSiblingsReflection(),
-    );
+List<Reflection> _siblingsReflection() => _siblingsReflectionList ??=
+    List<Reflection>.unmodifiable(_listSiblingsReflection());
 
 bool _registerSiblingsReflectionCalled = false;
 void _registerSiblingsReflection() {
diff --git a/test/bones_api_test_modules.reflection.g.dart b/test/bones_api_test_modules.reflection.g.dart
index 8bf90d8d..f8c5dcd2 100644
--- a/test/bones_api_test_modules.reflection.g.dart
+++ b/test/bones_api_test_modules.reflection.g.dart
@@ -84,7 +84,7 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   AboutModule$reflection withObject([AboutModule? obj]) =>
@@ -259,7 +259,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           const __TR<APIRoot>(APIRoot),
           'apiRoot',
           false,
-          (o) => () => o!.apiRoot,
+          (o) =>
+              () => o!.apiRoot,
           null,
           obj,
           true,
@@ -271,7 +272,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
+          (o) =>
+              () => o!.name,
           null,
           obj,
           true,
@@ -283,7 +285,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tString,
           'version',
           true,
-          (o) => () => o!.version,
+          (o) =>
+              () => o!.version,
           null,
           obj,
           true,
@@ -295,7 +298,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           const __TR<APIConfig>(APIConfig),
           'apiConfig',
           false,
-          (o) => () => o!.apiConfig,
+          (o) =>
+              () => o!.apiConfig,
           null,
           obj,
           false,
@@ -307,7 +311,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tString,
           'defaultRouteName',
           true,
-          (o) => () => o!.defaultRouteName,
+          (o) =>
+              () => o!.defaultRouteName,
           null,
           obj,
           false,
@@ -319,7 +324,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tSetString,
           'allRoutesNames',
           false,
-          (o) => () => o!.allRoutesNames,
+          (o) =>
+              () => o!.allRoutesNames,
           null,
           obj,
           false,
@@ -333,7 +339,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           ]),
           'routes',
           false,
-          (o) => () => o!.routes,
+          (o) =>
+              () => o!.routes,
           null,
           obj,
           false,
@@ -345,7 +352,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tString,
           'authenticationRoute',
           false,
-          (o) => () => o!.authenticationRoute,
+          (o) =>
+              () => o!.authenticationRoute,
           null,
           obj,
           false,
@@ -357,7 +365,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           const __TR<APISecurity>(APISecurity),
           'security',
           true,
-          (o) => () => o!.security,
+          (o) =>
+              () => o!.security,
           null,
           obj,
           false,
@@ -369,7 +378,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -382,7 +392,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           const __TR<InitializationStatus>(InitializationStatus),
           'initializationStatus',
           false,
-          (o) => () => o!.initializationStatus,
+          (o) =>
+              () => o!.initializationStatus,
           null,
           obj,
           false,
@@ -394,7 +405,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tBool,
           'isInitialized',
           false,
-          (o) => () => o!.isInitialized,
+          (o) =>
+              () => o!.isInitialized,
           null,
           obj,
           false,
@@ -406,7 +418,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tBool,
           'isInitializing',
           false,
-          (o) => () => o!.isInitializing,
+          (o) =>
+              () => o!.isInitializing,
           null,
           obj,
           false,
@@ -418,7 +431,8 @@ class AboutModule$reflection extends ClassReflection<AboutModule>
           __TR.tBool,
           'isAsyncInitialization',
           false,
-          (o) => () => o!.isAsyncInitialization,
+          (o) =>
+              () => o!.isAsyncInitialization,
           null,
           obj,
           false,
@@ -973,7 +987,7 @@ class UserModule$reflection extends ClassReflection<UserModule>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   UserModule$reflection withObject([UserModule? obj]) =>
@@ -1155,7 +1169,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           const __TR<APIRoot>(APIRoot),
           'apiRoot',
           false,
-          (o) => () => o!.apiRoot,
+          (o) =>
+              () => o!.apiRoot,
           null,
           obj,
           true,
@@ -1167,7 +1182,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
+          (o) =>
+              () => o!.name,
           null,
           obj,
           true,
@@ -1179,7 +1195,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tString,
           'version',
           true,
-          (o) => () => o!.version,
+          (o) =>
+              () => o!.version,
           null,
           obj,
           true,
@@ -1191,7 +1208,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           const __TR<APIConfig>(APIConfig),
           'apiConfig',
           false,
-          (o) => () => o!.apiConfig,
+          (o) =>
+              () => o!.apiConfig,
           null,
           obj,
           false,
@@ -1203,7 +1221,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tString,
           'defaultRouteName',
           true,
-          (o) => () => o!.defaultRouteName,
+          (o) =>
+              () => o!.defaultRouteName,
           null,
           obj,
           false,
@@ -1215,7 +1234,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tSetString,
           'allRoutesNames',
           false,
-          (o) => () => o!.allRoutesNames,
+          (o) =>
+              () => o!.allRoutesNames,
           null,
           obj,
           false,
@@ -1229,7 +1249,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           ]),
           'routes',
           false,
-          (o) => () => o!.routes,
+          (o) =>
+              () => o!.routes,
           null,
           obj,
           false,
@@ -1241,7 +1262,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tString,
           'authenticationRoute',
           false,
-          (o) => () => o!.authenticationRoute,
+          (o) =>
+              () => o!.authenticationRoute,
           null,
           obj,
           false,
@@ -1253,7 +1275,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           const __TR<APISecurity>(APISecurity),
           'security',
           true,
-          (o) => () => o!.security,
+          (o) =>
+              () => o!.security,
           null,
           obj,
           false,
@@ -1265,7 +1288,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -1278,7 +1302,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           const __TR<InitializationStatus>(InitializationStatus),
           'initializationStatus',
           false,
-          (o) => () => o!.initializationStatus,
+          (o) =>
+              () => o!.initializationStatus,
           null,
           obj,
           false,
@@ -1290,7 +1315,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tBool,
           'isInitialized',
           false,
-          (o) => () => o!.isInitialized,
+          (o) =>
+              () => o!.isInitialized,
           null,
           obj,
           false,
@@ -1302,7 +1328,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tBool,
           'isInitializing',
           false,
-          (o) => () => o!.isInitializing,
+          (o) =>
+              () => o!.isInitializing,
           null,
           obj,
           false,
@@ -1314,7 +1341,8 @@ class UserModule$reflection extends ClassReflection<UserModule>
           __TR.tBool,
           'isAsyncInitialization',
           false,
-          (o) => () => o!.isAsyncInitialization,
+          (o) =>
+              () => o!.isAsyncInitialization,
           null,
           obj,
           false,
@@ -2192,10 +2220,8 @@ List<Reflection> _listSiblingsReflection() => <Reflection>[
 ];
 
 List<Reflection>? _siblingsReflectionList;
-List<Reflection> _siblingsReflection() =>
-    _siblingsReflectionList ??= List<Reflection>.unmodifiable(
-      _listSiblingsReflection(),
-    );
+List<Reflection> _siblingsReflection() => _siblingsReflectionList ??=
+    List<Reflection>.unmodifiable(_listSiblingsReflection());
 
 bool _registerSiblingsReflectionCalled = false;
 void _registerSiblingsReflection() {
diff --git a/test/bones_api_test_utils_test.reflection.g.dart b/test/bones_api_test_utils_test.reflection.g.dart
index 70524d91..0caa3343 100644
--- a/test/bones_api_test_utils_test.reflection.g.dart
+++ b/test/bones_api_test_utils_test.reflection.g.dart
@@ -78,7 +78,7 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
   }
 
   @override
-  Version get languageVersion => Version.parse('3.7.0');
+  Version get languageVersion => Version.parse('3.10.0');
 
   @override
   MyInfoModule$reflection withObject([MyInfoModule? obj]) =>
@@ -255,7 +255,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<APIRoot>(APIRoot),
           'apiRoot',
           false,
-          (o) => () => o!.apiRoot,
+          (o) =>
+              () => o!.apiRoot,
           null,
           obj,
           true,
@@ -267,7 +268,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'name',
           false,
-          (o) => () => o!.name,
+          (o) =>
+              () => o!.name,
           null,
           obj,
           true,
@@ -279,7 +281,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'version',
           true,
-          (o) => () => o!.version,
+          (o) =>
+              () => o!.version,
           null,
           obj,
           true,
@@ -291,7 +294,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<APIConfig>(APIConfig),
           'apiConfig',
           false,
-          (o) => () => o!.apiConfig,
+          (o) =>
+              () => o!.apiConfig,
           null,
           obj,
           false,
@@ -303,7 +307,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'defaultRouteName',
           true,
-          (o) => () => o!.defaultRouteName,
+          (o) =>
+              () => o!.defaultRouteName,
           null,
           obj,
           false,
@@ -315,7 +320,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tSetString,
           'allRoutesNames',
           false,
-          (o) => () => o!.allRoutesNames,
+          (o) =>
+              () => o!.allRoutesNames,
           null,
           obj,
           false,
@@ -329,7 +335,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           ]),
           'routes',
           false,
-          (o) => () => o!.routes,
+          (o) =>
+              () => o!.routes,
           null,
           obj,
           false,
@@ -341,7 +348,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tString,
           'authenticationRoute',
           false,
-          (o) => () => o!.authenticationRoute,
+          (o) =>
+              () => o!.authenticationRoute,
           null,
           obj,
           false,
@@ -353,7 +361,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<APISecurity>(APISecurity),
           'security',
           true,
-          (o) => () => o!.security,
+          (o) =>
+              () => o!.security,
           null,
           obj,
           false,
@@ -365,7 +374,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tInt,
           'hashCode',
           false,
-          (o) => () => o!.hashCode,
+          (o) =>
+              () => o!.hashCode,
           null,
           obj,
           false,
@@ -378,7 +388,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           const __TR<InitializationStatus>(InitializationStatus),
           'initializationStatus',
           false,
-          (o) => () => o!.initializationStatus,
+          (o) =>
+              () => o!.initializationStatus,
           null,
           obj,
           false,
@@ -390,7 +401,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tBool,
           'isInitialized',
           false,
-          (o) => () => o!.isInitialized,
+          (o) =>
+              () => o!.isInitialized,
           null,
           obj,
           false,
@@ -402,7 +414,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tBool,
           'isInitializing',
           false,
-          (o) => () => o!.isInitializing,
+          (o) =>
+              () => o!.isInitializing,
           null,
           obj,
           false,
@@ -414,7 +427,8 @@ class MyInfoModule$reflection extends ClassReflection<MyInfoModule>
           __TR.tBool,
           'isAsyncInitialization',
           false,
-          (o) => () => o!.isAsyncInitialization,
+          (o) =>
+              () => o!.isAsyncInitialization,
           null,
           obj,
           false,
@@ -1000,10 +1014,8 @@ List<Reflection> _listSiblingsReflection() => <Reflection>[
 ];
 
 List<Reflection>? _siblingsReflectionList;
-List<Reflection> _siblingsReflection() =>
-    _siblingsReflectionList ??= List<Reflection>.unmodifiable(
-      _listSiblingsReflection(),
-    );
+List<Reflection> _siblingsReflection() => _siblingsReflectionList ??=
+    List<Reflection>.unmodifiable(_listSiblingsReflection());
 
 bool _registerSiblingsReflectionCalled = false;
 void _registerSiblingsReflection() {