Updated docker image (#7018)

frameworks/Dart/angel3/angel3.dockerfile

@@ -1,4 +1,4 @@
-FROM google/dart:latest
+FROM dart:latest
 
 COPY ./orm/config /app/config
 COPY ./orm/lib /app/lib
@@ -8,7 +8,7 @@ COPY ./orm/web /app/web
 COPY ./orm/*.yaml /app/
 
 WORKDIR /app
-RUN dart pub get
+RUN dart pub upgrade
 
 #RUN chmod -R 777 /app/run
 
@@ -18,4 +18,4 @@ RUN dart pub get
 # Set environment, start server
 ENV ANGEL_ENV=production
 EXPOSE 8080
-CMD dart ./run/prod.dart -p 8080 -a 0.0.0.0 -j 20
+CMD dart ./run/prod.dart -p 8080 -a 0.0.0.0 -j 50

frameworks/Dart/angel3/orm/lib/src/config/config.dart

@@ -19,7 +19,7 @@ AngelConfigurer configureServer(FileSystem fileSystem) {
     // See: https://github.com/angel-dart/jael
     var viewsDirectory = fileSystem.directory('views');
     var viewCache = <String, Document>{};
-    jaelTemplatePreload(viewsDirectory, viewCache);
+    await jaelTemplatePreload(viewsDirectory, viewCache);
     await app.configure(jael(viewsDirectory, cache: viewCache));
 
     // Apply another plug-ins, i.e. ones that *you* have written.

frameworks/Dart/angel3/orm/lib/src/config/plugins/orm.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_orm/angel3_orm.dart';
 import 'package:angel3_orm_postgres/angel3_orm_postgres.dart';
-import 'package:postgres/postgres.dart';
 import 'package:postgres_pool/postgres_pool.dart';
 
 Future<void> configureServer(Angel app) async {

frameworks/Dart/angel3/orm/lib/src/models/fortune.g.dart

@@ -36,6 +36,8 @@ class FortuneQuery extends Query<Fortune, FortuneQueryWhere> {
   @override
   final FortuneQueryValues values = FortuneQueryValues();
 
+  List<String> _selectedFields = [];
+
   FortuneQueryWhere? _where;
 
   @override
@@ -50,7 +52,15 @@ class FortuneQuery extends Query<Fortune, FortuneQueryWhere> {
 
   @override
   List<String> get fields {
-    return const ['id', 'message'];
+    const _fields = ['id', 'message'];
+    return _selectedFields.isEmpty
+        ? _fields
+        : _fields.where((field) => _selectedFields.contains(field)).toList();
+  }
+
+  FortuneQuery select(List<String> selectedFields) {
+    _selectedFields = selectedFields;
+    return this;
   }
 
   @override
@@ -63,17 +73,19 @@ class FortuneQuery extends Query<Fortune, FortuneQueryWhere> {
     return FortuneQueryWhere(this);
   }
 
-  static Fortune? parseRow(List row) {
+  Optional<Fortune> parseRow(List row) {
     if (row.every((x) => x == null)) {
-      return null;
+      return Optional.empty();
     }
-    var model = Fortune(id: (row[0] as int?), message: (row[1] as String?));
-    return model;
+    var model = Fortune(
+        id: fields.contains('id') ? (row[0] as int?) : null,
+        message: fields.contains('message') ? (row[1] as String?) : null);
+    return Optional.of(model);
   }
 
   @override
   Optional<Fortune> deserialize(List row) {
-    return Optional.ofNullable(parseRow(row));
+    return parseRow(row);
   }
 }
 

frameworks/Dart/angel3/orm/lib/src/models/world.g.dart

@@ -35,6 +35,8 @@ class WorldQuery extends Query<World, WorldQueryWhere> {
   @override
   final WorldQueryValues values = WorldQueryValues();
 
+  List<String> _selectedFields = [];
+
   WorldQueryWhere? _where;
 
   @override
@@ -49,7 +51,15 @@ class WorldQuery extends Query<World, WorldQueryWhere> {
 
   @override
   List<String> get fields {
-    return const ['id', 'randomNumber'];
+    const _fields = ['id', 'randomNumber'];
+    return _selectedFields.isEmpty
+        ? _fields
+        : _fields.where((field) => _selectedFields.contains(field)).toList();
+  }
+
+  WorldQuery select(List<String> selectedFields) {
+    _selectedFields = selectedFields;
+    return this;
   }
 
   @override
@@ -62,17 +72,20 @@ class WorldQuery extends Query<World, WorldQueryWhere> {
     return WorldQueryWhere(this);
   }
 
-  static World? parseRow(List row) {
+  Optional<World> parseRow(List row) {
     if (row.every((x) => x == null)) {
-      return null;
+      return Optional.empty();
     }
-    var model = World(id: (row[0] as int?), randomNumber: (row[1] as int?));
-    return model;
+    var model = World(
+        id: fields.contains('id') ? (row[0] as int?) : null,
+        randomNumber:
+            fields.contains('randomNumber') ? (row[1] as int?) : null);
+    return Optional.of(model);
   }
 
   @override
   Optional<World> deserialize(List row) {
-    return Optional.ofNullable(parseRow(row));
+    return parseRow(row);
   }
 }
 

frameworks/Dart/angel3/orm/lib/src/routes/controllers/controllers.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:math';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_orm/angel3_orm.dart';
@@ -45,10 +46,12 @@ Future configureServer(Angel app) async {
   // Return data in json
   app.get('/json', (req, res) => res.json({'message': 'Hello, World!'}));
 
+  const reply = "Hello, World!";
+
   // Return data in plaintext
   app.get('/plaintext', (req, res) async {
-    res.write('Hello, World!');
-    res.close();
+    res.contentLength = reply.length;
+    res.write(reply);
   });
 
   // Add an entry and sort a list of fortune
@@ -66,7 +69,6 @@ Future configureServer(Angel app) async {
     //print('Process Time: ${stopwatch.elapsed.inMilliseconds}ms');
     //stopwatch.stop();
 
-    //res.json(list);
     res.render('listing', {'fortunes': list});
   });
 

frameworks/Dart/angel3/orm/lib/src/routes/routes.dart

@@ -56,5 +56,7 @@ AngelConfigurer configureServer(FileSystem fileSystem) {
         return await oldErrorHandler(e, req, res);
       }
     };
+
+    app.enableCache();
   };
 }

frameworks/Dart/angel3/orm/pubspec.lock

@@ -56,14 +56,14 @@ packages:
       name: angel3_hot
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.2"
+    version: "4.3.0"
   angel3_http_exception:
     dependency: transitive
     description:
       name: angel3_http_exception
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   angel3_jael:
     dependency: "direct main"
     description:
@@ -77,21 +77,21 @@ packages:
       name: angel3_migration
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.3"
   angel3_migration_runner:
     dependency: "direct dev"
     description:
       name: angel3_migration_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.1"
   angel3_mock_request:
     dependency: transitive
     description:
       name: angel3_mock_request
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   angel3_model:
     dependency: transitive
     description:
@@ -105,21 +105,21 @@ packages:
       name: angel3_orm
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.4"
+    version: "4.0.5"
   angel3_orm_generator:
     dependency: "direct dev"
     description:
       name: angel3_orm_generator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.3"
+    version: "4.3.0"
   angel3_orm_postgres:
     dependency: "direct main"
     description:
       name: angel3_orm_postgres
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "3.3.0"
   angel3_production:
     dependency: "direct main"
     description:
@@ -168,7 +168,7 @@ packages:
       name: angel3_validate
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   angel3_websocket:
     dependency: transitive
     description:
@@ -385,7 +385,7 @@ packages:
       name: coverage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   crypto:
     dependency: transitive
     description:
@@ -833,7 +833,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.5.0"
+    version: "8.1.0"
   watcher:
     dependency: transitive
     description: