Updated pubspec

README.md

@@ -16,7 +16,7 @@
 
 Angel3 is a fork of archived Angel framework to support Dart SDK 2.12.x or later. It is a full-stack Web framework in Dart that aims to streamline development by providing many common features out-of-the-box in a consistent manner. One of the main goal is to enable developers to build both frontend and backend in the same language, Dart. Angel3 framework is designed as a collection of plugins that enable developers to pick and choose the parts needed for their projects. A series of starter templates are also provided for quick start and trial run with Angel3 framework. Visit our [website](<https://angel3-framework.web.app/>) to learn more.
 
-The availabe features in Angel3 includes:
+The available features in Angel3 includes:
 
 * Static File Handling
 * Basic Authentication
@@ -34,7 +34,7 @@ The status of the code base is as follows:
 
 Branch: `master`
 
-* Dart version : 2.16.x or later.
+* Dart version : 2.17.x or later.
 * Publish      : Yes. Refer to packages with `angel3_` prefix on [pub.dev](https://pub.dev/publishers/dukefirehawk.com/packages).
 * Null Safety  : Yes
 * Status       : Production
@@ -44,10 +44,17 @@ For more details, checkout [Project Status](https://github.com/dukefirehawk/ange
 
 ## Release Notes
 
+### Release 7.0.0
+
+* Updated all `angel3_` packages to require dart >= 2.17.x
+* Updated dependencies to the latest libraries
+* Fixed ORM issues
+* Fixed `dart analyze .` warnings
+
 ### Release 6.0.0
 
 * Updated all `angel3_` packages to 6.0.0
-* Updated all `angel3_` packages to use SDK 2.16.x or later
+* Updated all `angel3_` packages to require dart >= 2.16.x
 * Updated ORM to support MariaDB 10.2.x (stable) and MySQL 8.x (beta)
 * Updated code generator to use `analyzer` 3.x.x
 * Updated exception handling
@@ -126,11 +133,11 @@ The performance benchmark can be found at
 
 [TechEmpower Framework Benchmarks Round 21](https://www.techempower.com/benchmarks/#section=data-r21&test=composite)
 
-The test cases are build using standard `Angel3 ORM` template. This result will be used for fine-tuning Angel3 framework. The following test cases will be progressively added in the upcoming update to benchmark.
+The test cases are build using standard `Angel3 ORM` template. The result are used for fine-tuning Angel3 framework. The following test cases will be added in the upcoming update to the benchmark.
 
-1. Angel3 with MongoDB
+1. Angel3 with ORM for MySQL
-2. Angel3 with ORM MySQL
+2. Cached queries
-3. Cached queries
+3. Angel3 with MongoDB
 
 ## Examples and Documentation
 
@@ -146,4 +153,4 @@ Interested in contributing to Angel3? See the contribution guide [here](CONTRIBU
 
 ## Donation & Support
 
-If you like this project and want to support its development, you can make a [donation](https://paypal.me/dukefirehawk?country.x=MY&locale.x=en_US) via paypal service.
+If you like this project and interested in supporting its development, you can make a donation via [paypal](https://paypal.me/dukefirehawk?country.x=MY&locale.x=en_US) service.

TODO.md

@@ -4,8 +4,6 @@
 
 * Update examples
 * Update User Guide
-* Fix bugs
-  * `angel3_orm_mysql`
 
 ## Long Term Goal
 

packages/auth/.gitignore

@@ -69,3 +69,4 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+.DS_Store

packages/auth/pubspec.yaml

@@ -20,16 +20,16 @@ dev_dependencies:
   io: ^1.0.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/auth_oauth2/pubspec.yaml

@@ -13,18 +13,18 @@ dependencies:
 dev_dependencies:
   logging: ^1.0.1
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth

packages/auth_twitter/pubspec.yaml

@@ -16,18 +16,18 @@ dependencies:
 dev_dependencies:
   logging: ^1.0.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth

packages/cache/pubspec.yaml

@@ -17,26 +17,26 @@ dev_dependencies:
   http: ^0.13.3
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/client/.gitignore

@@ -69,3 +69,4 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+.DS_Store

packages/client/pubspec.yaml

@@ -24,18 +24,18 @@ dev_dependencies:
   build_web_compilers: ^3.2.1
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth

packages/configuration/pubspec.yaml

@@ -17,16 +17,16 @@ dev_dependencies:
   lints: ^2.0.0
   belatuk_pretty_logging: ^5.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/container/angel_container/lib/src/mirrors/reflector.dart

@@ -48,16 +48,16 @@ class MirrorsReflector extends Reflector {
   @override
   ReflectedType reflectFutureOf(Type type) {
     var inner = reflectType(type);
-    dart.TypeMirror _mirror;
+    dart.TypeMirror localMirror;
     if (inner is _ReflectedClassMirror) {
-      _mirror = inner.mirror;
+      localMirror = inner.mirror;
     } else if (inner is _ReflectedTypeMirror) {
-      _mirror = inner.mirror;
+      localMirror = inner.mirror;
     } else {
       throw ArgumentError('$type is not a class or type.');
     }
 
-    var future = dart.reflectType(Future, [_mirror.reflectedType]);
+    var future = dart.reflectType(Future, [localMirror.reflectedType]);
     return _ReflectedClassMirror(future as dart.ClassMirror);
   }
 

packages/container/angel_container_generator/pubspec.yaml

@@ -12,7 +12,7 @@ dev_dependencies:
   build_runner: ^2.1.2
   build_test: ^2.1.3
   test: ^1.21.0
-  lints: ^1.0.1
+  lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../angel_container
+#     path: ../angel_container

packages/cors/pubspec.yaml

@@ -12,26 +12,26 @@ dev_dependencies:
   http: ^0.13.3
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test

packages/file_service/pubspec.yaml

@@ -12,16 +12,16 @@ dependencies:
 dev_dependencies:
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/framework/pubspec.yaml

@@ -35,15 +35,15 @@ dev_dependencies:
   io: ^1.0.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
     

packages/hot/pubspec.yaml

@@ -19,23 +19,23 @@ dev_dependencies:
   http: ^0.13.2
   logging: ^1.0.1
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
  

packages/html/pubspec.yaml

@@ -14,26 +14,26 @@ dev_dependencies:
   logging: ^1.0.1
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route

packages/jael/angel_jael/pubspec.yaml

@@ -18,30 +18,30 @@ dev_dependencies:
   html: ^0.15.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../../auth 
+#     path: ../../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../../client
+#     path: ../../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../../websocket
+#     path: ../../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../../validate
+#     path: ../../validate
-  angel3_test:
+#   angel3_test:
-    path: ../../test
+#     path: ../../test
-  jael3:
+#   jael3:
-    path: ../jael
+#     path: ../jael
-  jael3_preprocessor:
+#   jael3_preprocessor:
-    path: ../jael_preprocessor
+#     path: ../jael_preprocessor

packages/jael/jael_preprocessor/pubspec.yaml

@@ -14,6 +14,6 @@ dev_dependencies:
   belatuk_code_buffer: ^4.0.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  jael3:
+#   jael3:
-    path: ../jael
+#     path: ../jael

packages/jinja/pubspec.yaml

@@ -12,26 +12,26 @@ dev_dependencies:
   path: ^1.8.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/markdown/pubspec.yaml

@@ -13,26 +13,26 @@ dev_dependencies:
   angel3_test: ^7.0.0
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/mock_request/pubspec.yaml

@@ -8,18 +8,18 @@ environment:
 dependencies:
   charcode: ^1.2.0
 dev_dependencies:
-  angel3_framework: ^7.0.0
+  #angel3_framework: ^7.0.0
   http: ^0.13.2
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container

packages/mock_request/test/all_test.dart

@@ -1,13 +1,14 @@
-import 'dart:convert';
+//import 'dart:convert';
-import 'dart:io';
+//import 'dart:io';
-import 'package:angel3_framework/angel3_framework.dart';
+//import 'package:angel3_framework/angel3_framework.dart';
-import 'package:angel3_framework/http.dart';
+//import 'package:angel3_framework/http.dart';
-import 'package:angel3_mock_request/angel3_mock_request.dart';
+//import 'package:angel3_mock_request/angel3_mock_request.dart';
-import 'package:test/test.dart';
+//import 'package:test/test.dart';
 
 void main() {
-  var uri = Uri.parse('http://localhost:3000');
+  //var uri = Uri.parse('http://localhost:3000');
 
+  /*
   var app = Angel()
     ..get('/foo', (req, res) => 'Hello, world!')
     ..post('/body',
@@ -64,4 +65,5 @@ void main() {
     expect(rq.uri.path, '/mock');
     expect(rq.requestedUri.toString(), 'http://example.com/mock');
   });
+  */
 }

packages/mongo/pubspec.yaml

@@ -14,16 +14,16 @@ dev_dependencies:
   http: ^0.13.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/mustache/pubspec.yaml

@@ -14,16 +14,16 @@ dev_dependencies:
   http: ^0.13.3
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/oauth2/pubspec.yaml

@@ -18,26 +18,26 @@ dev_dependencies:
   lints: ^2.0.0
   test: ^1.21.0
   uuid: ^3.0.4
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth

packages/orm/angel_migration/pubspec.yaml

@@ -9,6 +9,6 @@ dependencies:
   angel3_orm: ^7.0.0
 dev_dependencies:
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-   angel3_orm:
+#    angel3_orm:
-     path: ../angel_orm
+#      path: ../angel_orm

packages/orm/angel_migration_runner/pubspec.yaml

@@ -16,8 +16,8 @@ dependencies:
   logging: ^1.0.0
 dev_dependencies:
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-   angel3_orm:
+#    angel3_orm:
-     path: ../angel_orm
+#      path: ../angel_orm
-   angel3_migration:
+#    angel3_migration:
-     path: ../angel_migration
+#      path: ../angel_migration

packages/orm/angel_orm/pubspec.yaml

@@ -19,10 +19,10 @@ dev_dependencies:
   build_runner: ^2.1.1
   test: ^1.17.4
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model

packages/orm/angel_orm_generator/pubspec.yaml

@@ -30,25 +30,25 @@ dev_dependencies:
   postgres: ^2.4.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration
  

packages/orm/angel_orm_mysql/pubspec.yaml

@@ -17,18 +17,18 @@ dev_dependencies:
   build_runner: ^2.0.1
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_orm_test:
+#   angel3_orm_test:
-    path: ../angel_orm_test
+#     path: ../angel_orm_test
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_orm_generator:
+#   angel3_orm_generator:
-    path: ../angel_orm_generator
+#     path: ../angel_orm_generator
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration

packages/orm/angel_orm_postgres/pubspec.yaml

@@ -16,14 +16,14 @@ dev_dependencies:
   angel3_orm_test: ^7.0.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_serialize:
+#   angel3_serialize:
-     path: ../../serialize/angel_serialize
+#      path: ../../serialize/angel_serialize
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_orm_test:
+#   angel3_orm_test:
-     path: ../angel_orm_test
+#      path: ../angel_orm_test
-  angel3_orm:
+#   angel3_orm:
-     path: ../angel_orm
+#      path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-     path: ../angel_migration
+#      path: ../angel_migration

packages/orm/angel_orm_service/lib/angel3_orm_service.dart

@@ -69,7 +69,9 @@ class OrmService<Id, Data, TQuery extends Query<Data, QueryWhere>>
                 var descending = false;
                 if (value is String) {
                   descending = value == '-1';
-                } else if (value is num) descending = value.toInt() == -1;
+                } else if (value is num) {
+                  descending = value.toInt() == -1;
+                }
                 query.orderBy(key.toString(), descending: descending);
               });
             } else if (v is String) {

packages/orm/angel_orm_service/pubspec.yaml

@@ -16,37 +16,36 @@ dev_dependencies:
   angel3_orm_generator: ^7.0.0
   angel3_orm_postgres: ^7.0.0
   angel3_serialize: ^7.0.0
-  #angel3_orm_test: ^7.0.0
   build_runner: ^2.0.4
   logging: ^1.0.1
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_orm_test:
+#   angel3_orm_test:
-    path: ../angel_orm_test
+#     path: ../angel_orm_test
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_orm_generator:
+#   angel3_orm_generator:
-    path: ../angel_orm_generator
+#     path: ../angel_orm_generator
-  angel3_orm_postgres:
+#   angel3_orm_postgres:
-    path: ../angel_orm_postgres
+#     path: ../angel_orm_postgres
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration
-  angel3_migration_runner:
+#   angel3_migration_runner:
-    path: ../angel_migration_runner
+#     path: ../angel_migration_runner

packages/orm/angel_orm_test/lib/src/util.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:io/ansi.dart';
 
 void printSeparator(String title) {
-  var b = StringBuffer('===' + title.toUpperCase());
+  var b = StringBuffer('===${title.toUpperCase()}');
 
   int columns = 80;
   if (stdout.hasTerminal) {

packages/orm/angel_orm_test/pubspec.yaml

@@ -19,26 +19,26 @@ dev_dependencies:
   angel3_framework: ^7.0.0
   build_runner: ^2.0.1
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-     path: ../../serialize/angel_serialize_generator
+#      path: ../../serialize/angel_serialize_generator
-  angel3_orm:
+#   angel3_orm:
-     path: ../angel_orm
+#      path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-     path: ../angel_migration
+#      path: ../angel_migration
-  angel3_orm_generator:
+#   angel3_orm_generator:
-     path: ../angel_orm_generator
+#      path: ../angel_orm_generator

packages/paginate/pubspec.yaml

@@ -12,26 +12,26 @@ dev_dependencies:
   logging: ^1.0.1
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate    
+#     path: ../validate    

packages/production/pubspec.yaml

@@ -15,16 +15,16 @@ dependencies:
   intl: ^0.17.0
 dev_dependencies:
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/proxy/pubspec.yaml

@@ -16,26 +16,26 @@ dev_dependencies:
   logging: ^1.0.1
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/redis/pubspec.yaml

@@ -12,16 +12,16 @@ dependencies:
 dev_dependencies:
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/security/pubspec.yaml

@@ -19,30 +19,30 @@ dev_dependencies:
   logging: ^1.0.0
   resp_client: ^1.2.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_production:
+#   angel3_production:
-    path: ../production
+#     path: ../production
-  angel3_redis:
+#   angel3_redis:
-    path: ../redis
+#     path: ../redis
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/sembast/pubspec.yaml

@@ -13,16 +13,16 @@ dev_dependencies:
   logging: ^1.0.1
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/seo/pubspec.yaml

@@ -17,28 +17,28 @@ dev_dependencies:
   logging: ^1.0.1
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_static:
+#   angel3_static:
-    path: ../static
+#     path: ../static
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/serialize/angel_serialize/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   quiver: ^3.0.1
 dev_dependencies:
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
   

packages/serialize/angel_serialize_generator/pubspec.yaml

@@ -24,8 +24,8 @@ dev_dependencies:
   collection: ^1.15.0
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../angel_serialize
+#     path: ../angel_serialize

packages/shelf/pubspec.yaml

@@ -3,6 +3,7 @@ version: 7.0.0-beta.1
 description: Shelf interop with Angel3. Use this to wrap existing server code.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/shelf
+publish_to: none
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
@@ -21,26 +22,26 @@ dev_dependencies:
   shelf_static: ^1.1.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/static/pubspec.yaml

@@ -20,27 +20,27 @@ dev_dependencies:
   matcher: ^0.12.10
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
   

packages/sync/pubspec.yaml

@@ -14,26 +14,26 @@ dev_dependencies:
   angel3_test: ^7.0.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/test/pubspec.yaml

@@ -19,24 +19,24 @@ dependencies:
 dev_dependencies: 
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/user_agent/angel_user_agent/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 7.0.0
+## 7.0.0-beta.1
 
 * Require Dart >= 2.17
 

packages/user_agent/angel_user_agent/pubspec.yaml

@@ -9,16 +9,16 @@ dependencies:
   angel3_framework: ^7.0.0
   user_agent_analyzer: ^3.0.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework

packages/validate/pubspec.yaml

@@ -16,16 +16,16 @@ dev_dependencies:
   logging: ^1.0.1
   lints: ^2.0.0
   test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/websocket/lib/base_websocket_client.dart

@@ -3,7 +3,7 @@ import 'dart:collection';
 import 'dart:convert';
 import 'package:angel3_client/angel3_client.dart';
 import 'package:angel3_client/base_angel_client.dart';
-import 'package:http/src/base_client.dart' as http;
+import 'package:http/http.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:web_socket_channel/status.dart' as status;
 import 'angel3_websocket.dart';
@@ -85,7 +85,7 @@ abstract class BaseWebSocketClient extends BaseAngelClient {
     }
   }
 
-  BaseWebSocketClient(http.BaseClient client, baseUrl,
+  BaseWebSocketClient(BaseClient client, baseUrl,
       {this.reconnectOnClose = true, Duration? reconnectInterval})
       : super(client, baseUrl) {
     _reconnectInterval = reconnectInterval ?? Duration(seconds: 10);

packages/websocket/lib/server.dart

@@ -297,8 +297,8 @@ class AngelWebSocket {
   }
 
   /// Hooks a service up to have its events broadcasted.
-  dynamic hookupService(Pattern _path, HookedService service) {
+  dynamic hookupService(Pattern path, HookedService service) {
-    var path = _path.toString();
+    var localPath = path.toString();
 
     service.after(
       [
@@ -307,9 +307,9 @@ class AngelWebSocket {
         HookedServiceEvent.updated,
         HookedServiceEvent.removed
       ],
-      serviceHook(path),
+      serviceHook(localPath),
     );
-    _servicesAlreadyWired.add(path);
+    _servicesAlreadyWired.add(localPath);
   }
 
   /// Runs before firing [onConnection].

packages/websocket/lib/websocket_context.dart

@@ -4,7 +4,7 @@ part of angel3_websocket.server;
 /// [RequestContext] and [ResponseContext] attached.
 class WebSocketContext {
   /// Use this to listen for events.
-  _WebSocketEventTable on = _WebSocketEventTable();
+  WebSocketEventTable on = WebSocketEventTable();
 
   /// The underlying [StreamChannel].
   final StreamChannel channel;
@@ -60,7 +60,7 @@ class WebSocketContext {
   void sendError(AngelHttpException error) => send(errorEvent, error.toJson());
 }
 
-class _WebSocketEventTable {
+class WebSocketEventTable {
   final Map<String, StreamController<Map?>> _handlers = {};
 
   StreamController<Map?>? _getStreamForEvent(String eventName) {

packages/websocket/pubspec.yaml

@@ -22,20 +22,20 @@ dev_dependencies:
   angel3_model: ^7.0.0
   test: ^1.21.0
   lints: ^2.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client

packages/websocket/test/auth_test.dart

@@ -7,7 +7,7 @@ import 'package:angel3_websocket/server.dart';
 import 'package:logging/logging.dart';
 import 'package:test/test.dart';
 
-const Map<String, String> USER = {'username': 'foo', 'password': 'bar'};
+const Map<String, String> user = {'username': 'foo', 'password': 'bar'};
 
 void main() {
   Angel app;
@@ -19,12 +19,12 @@ void main() {
     app = Angel();
     http = AngelHttp(app, useZone: false);
     var auth = AngelAuth(
-        serializer: (_) async => 'baz', deserializer: (_) async => USER);
+        serializer: (_) async => 'baz', deserializer: (_) async => user);
 
     auth.strategies['local'] = LocalAuthStrategy(
       (username, password) async {
         if (username == 'foo' && password == 'bar') {
-          return USER;
+          return user;
         }
       },
     );
@@ -54,7 +54,7 @@ void main() {
   });
 
   test('auth event fires', () async {
-    var localAuth = await client.authenticate(type: 'local', credentials: USER);
+    var localAuth = await client.authenticate(type: 'local', credentials: user);
     print('JWT: ${localAuth.token}');
 
     ws.authenticateViaJwt(localAuth.token);

packages/websocket/test/service/common.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:angel3_framework/angel3_framework.dart';
-import 'package:angel3_model/angel3_model.dart';
 import 'package:angel3_websocket/base_websocket_client.dart';
 import 'package:angel3_websocket/server.dart';
 import 'package:test/test.dart';