diff --git a/CHANGELOG.md b/CHANGELOG.md index e9d98827..ee262a5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ * Updated: angel3_orm * Updated: angel3_orm_generator * Updated: angel3_migration -* Updated: angel3_migration_generator +* Updated: angel3_migration_runner * Updated: angel3_orm_postgresql * Updated: angel3_orm_mysql * Updated: angel3_orm_service diff --git a/README.md b/README.md index f6d329af..8816346d 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ For more details, checkout [Project Status](https://github.com/dukefirehawk/ange ### Release 8.0.0 (Current) -* Updated `angel3_` packages to require dart >= 3.0.x +* Updated `angel3_` packages to require dart >= 3.0.0 * Updated dependencies to the latest * Resolved issues related to generated container diff --git a/TODO.md b/TODO.md index 78d502d9..b4359393 100644 --- a/TODO.md +++ b/TODO.md @@ -9,4 +9,4 @@ * Refactor Angel3 architecture for performance and security * Improve ORM features - * Improve performances + * Improve HTTP performance diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md index 0ec94e79..3c1df8fd 100644 --- a/packages/auth/CHANGELOG.md +++ b/packages/auth/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/auth/pubspec.yaml b/packages/auth/pubspec.yaml index 7c8a3228..48dab1e8 100644 --- a/packages/auth/pubspec.yaml +++ b/packages/auth/pubspec.yaml @@ -1,6 +1,6 @@ name: angel3_auth description: A complete authentication plugin for Angel3. Includes support for stateless JWT tokens, Basic Auth, and more. -version: 8.0.0 +version: 8.1.0 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/auth environment: @@ -19,7 +19,7 @@ dev_dependencies: http: ^1.0.0 io: ^1.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/auth_oauth2/CHANGELOG.md b/packages/auth_oauth2/CHANGELOG.md index ba854ed7..e43cb675 100644 --- a/packages/auth_oauth2/CHANGELOG.md +++ b/packages/auth_oauth2/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/auth_oauth2/pubspec.yaml b/packages/auth_oauth2/pubspec.yaml index d8c8851b..0fa6522c 100644 --- a/packages/auth_oauth2/pubspec.yaml +++ b/packages/auth_oauth2/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_auth_oauth2 -version: 8.0.0 +version: 8.1.0 description: Angel3 library for authenticating users with external identity providers via OAuth2. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/auth_oauth2 @@ -12,7 +12,7 @@ dependencies: oauth2: ^2.0.0 dev_dependencies: logging: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/auth_twitter/CHANGELOG.md b/packages/auth_twitter/CHANGELOG.md index 80e655a6..81dbbd7b 100644 --- a/packages/auth_twitter/CHANGELOG.md +++ b/packages/auth_twitter/CHANGELOG.md @@ -4,6 +4,8 @@ * Require Dart >= 3.0 * Updated `oauth1` to `belatuk_oauth1` +* Updated `lints` to 3.0.0 +* Fixed linter warnings ## 7.0.0 diff --git a/packages/auth_twitter/lib/angel3_auth_twitter.dart b/packages/auth_twitter/lib/angel3_auth_twitter.dart index bae7a713..c40ca9d9 100644 --- a/packages/auth_twitter/lib/angel3_auth_twitter.dart +++ b/packages/auth_twitter/lib/angel3_auth_twitter.dart @@ -5,7 +5,8 @@ import 'package:angel3_auth/angel3_auth.dart'; import 'package:angel3_framework/angel3_framework.dart'; import 'package:http/http.dart' as http; import 'package:path/path.dart' as p; -import 'package:oauth1/oauth1.dart' as oauth; +//import 'package:oauth1/oauth1.dart' as oauth; +import 'package:belatuk_oauth1/belatuk_oauth1.dart' as oauth; import 'package:dart_twitter_api/twitter_api.dart'; /// Authenticates users by connecting to Twitter's API. diff --git a/packages/auth_twitter/pubspec.yaml b/packages/auth_twitter/pubspec.yaml index 6032b8a4..4495fc76 100644 --- a/packages/auth_twitter/pubspec.yaml +++ b/packages/auth_twitter/pubspec.yaml @@ -10,13 +10,14 @@ dependencies: angel3_auth: ^8.0.0 angel3_framework: ^8.0.0 http: ^1.0.0 - path: ^1.0.0 + path: ^1.9.0 belatuk_oauth1: ^3.0.0 dart_twitter_api: ^0.5.6+1 dev_dependencies: logging: ^1.2.0 - lints: ^2.1.0 -# dependency_overrides: + lints: ^3.0.0 +dependency_overrides: + http: ^1.0.0 # angel3_container: # path: ../container/angel_container # angel3_framework: diff --git a/packages/cache/CHANGELOG.md b/packages/cache/CHANGELOG.md index ea6458af..ddd3dede 100644 --- a/packages/cache/CHANGELOG.md +++ b/packages/cache/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/cache/pubspec.yaml b/packages/cache/pubspec.yaml index d8b16c70..f1a401de 100644 --- a/packages/cache/pubspec.yaml +++ b/packages/cache/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_cache -version: 8.0.0 +version: 8.1.0 description: A service that provides HTTP caching to the response data for Angel3 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/cache @@ -16,7 +16,7 @@ dev_dependencies: glob: ^2.0.1 http: ^1.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 42f2641f..f8b36933 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/client/lib/io.dart b/packages/client/lib/io.dart index ffc3e5c9..49ab641a 100644 --- a/packages/client/lib/io.dart +++ b/packages/client/lib/io.dart @@ -48,8 +48,7 @@ class RestService extends BaseAngelService { final Type? type; - RestService(http.BaseClient client, BaseAngelClient app, url, this.type) - : super(client, app, url); + RestService(super.client, super.app, super.url, this.type); @override Data? deserialize(x) { diff --git a/packages/client/pubspec.yaml b/packages/client/pubspec.yaml index 504bda45..f0da0f01 100644 --- a/packages/client/pubspec.yaml +++ b/packages/client/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_client -version: 8.0.0 +version: 8.1.0 description: A browser, mobile and command line based client that supports querying Angel3 servers homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/client @@ -24,7 +24,7 @@ dev_dependencies: build_runner: ^2.4.0 build_web_compilers: ^4.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/configuration/CHANGELOG.md b/packages/configuration/CHANGELOG.md index 2aaedd2c..65799ad9 100644 --- a/packages/configuration/CHANGELOG.md +++ b/packages/configuration/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/configuration/pubspec.yaml b/packages/configuration/pubspec.yaml index 1463fe69..014abbbe 100644 --- a/packages/configuration/pubspec.yaml +++ b/packages/configuration/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_configuration -version: 8.0.0 +version: 8.1.0 description: Automatic YAML application configuration loader for Angel 3, with .env support. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/configuration @@ -14,7 +14,7 @@ dependencies: dev_dependencies: io: ^1.0.0 logging: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 belatuk_pretty_logging: ^6.0.0 test: ^1.24.0 # dependency_overrides: diff --git a/packages/container/angel_container/CHANGELOG.md b/packages/container/angel_container/CHANGELOG.md index ab260842..f64e521f 100644 --- a/packages/container/angel_container/CHANGELOG.md +++ b/packages/container/angel_container/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed analyser warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/container/angel_container/pubspec.yaml b/packages/container/angel_container/pubspec.yaml index 3c0173e2..70146525 100644 --- a/packages/container/angel_container/pubspec.yaml +++ b/packages/container/angel_container/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_container -version: 8.0.0 +version: 8.1.0 description: Angel3 hierarchical DI container, and pluggable backends for reflection. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/container/angel_container @@ -10,4 +10,4 @@ dependencies: quiver: ^3.2.0 dev_dependencies: test: ^1.24.0 - lints: ^2.1.0 \ No newline at end of file + lints: ^3.0.0 \ No newline at end of file diff --git a/packages/container/angel_container/test/common.dart b/packages/container/angel_container/test/common.dart index 8bbe8169..9fa9f114 100644 --- a/packages/container/angel_container/test/common.dart +++ b/packages/container/angel_container/test/common.dart @@ -116,7 +116,7 @@ class Pokemon { } class KantoPokemon extends Pokemon { - KantoPokemon(String name, PokemonType type) : super(name, type); + KantoPokemon(super.name, super.type); } enum PokemonType { water, fire, grass, ice, poison, flying } diff --git a/packages/container/angel_container_generator/CHANGELOG.md b/packages/container/angel_container_generator/CHANGELOG.md index d832dc97..0163c343 100644 --- a/packages/container/angel_container_generator/CHANGELOG.md +++ b/packages/container/angel_container_generator/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed analyser warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/container/angel_container_generator/README.md b/packages/container/angel_container_generator/README.md index 4762e5a0..c41399e9 100644 --- a/packages/container/angel_container_generator/README.md +++ b/packages/container/angel_container_generator/README.md @@ -5,7 +5,7 @@ [![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) [![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/master/packages/container/angel3_container_generator/LICENSE) -An alternative container for Angel3 that uses `reflectable` package instead of `dart:mirrors` for reflection. However, `reflectable` has much limited relfection capabilities when compared to `dart:mirrors`. +An alternative container for Angel3 that uses `reflectable` package instead of `dart:mirrors` for reflection. However, `reflectable` has more limited relfection capabilities when compared to `dart:mirrors`. ## Usage @@ -26,6 +26,7 @@ An alternative container for Angel3 that uses `reflectable` package instead of ` ## Known limitation +* `analyser` 6.x is not supported due to `reflectable` * Reflection on functions/closures is not supported * Reflection on private declarations is not supported * Reflection on generic type is not supported diff --git a/packages/container/angel_container_generator/example/main.reflectable.dart b/packages/container/angel_container_generator/example/main.reflectable.dart index 78da37c2..b274955a 100644 --- a/packages/container/angel_container_generator/example/main.reflectable.dart +++ b/packages/container/angel_container_generator/example/main.reflectable.dart @@ -426,7 +426,7 @@ final _data = { }, 4, 10, - const [], + const [15], const [], null, (o) => false, diff --git a/packages/container/angel_container_generator/pubspec.yaml b/packages/container/angel_container_generator/pubspec.yaml index c29fdf25..7505be7d 100644 --- a/packages/container/angel_container_generator/pubspec.yaml +++ b/packages/container/angel_container_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_container_generator -version: 8.0.0 +version: 8.1.0 description: Codegen support for using pkg:reflectable with pkg:angel3_container. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/container/angel_container_generator @@ -12,7 +12,7 @@ dev_dependencies: build_runner: ^2.4.0 build_test: ^2.1.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../angel_container diff --git a/packages/container/angel_container_generator/test/reflector_test.dart b/packages/container/angel_container_generator/test/reflector_test.dart index a4070dce..4db6965e 100644 --- a/packages/container/angel_container_generator/test/reflector_test.dart +++ b/packages/container/angel_container_generator/test/reflector_test.dart @@ -142,7 +142,7 @@ class Pokemon { @contained class KantoPokemon extends Pokemon { - KantoPokemon(String name, PokemonType type) : super(name, type); + KantoPokemon(super.name, super.type); } @contained diff --git a/packages/container/angel_container_generator/test/reflector_test.reflectable.dart b/packages/container/angel_container_generator/test/reflector_test.reflectable.dart index 1cd81134..73aae70f 100644 --- a/packages/container/angel_container_generator/test/reflector_test.reflectable.dart +++ b/packages/container/angel_container_generator/test/reflector_test.reflectable.dart @@ -641,7 +641,7 @@ final _data = { }, 2, 18, - const [], + const [23], const [], null, (o) => false, @@ -3598,7 +3598,7 @@ final _data = { null), r.ParameterMirrorImpl( r'name', - 134348806, + 134349830, 70, const prefix0.ContainedReflectable(), 15, @@ -3610,7 +3610,7 @@ final _data = { null), r.ParameterMirrorImpl( r'type', - 134348806, + 134349830, 70, const prefix0.ContainedReflectable(), 6, diff --git a/packages/cors/CHANGELOG.md b/packages/cors/CHANGELOG.md index 2c587af3..417dd3d3 100644 --- a/packages/cors/CHANGELOG.md +++ b/packages/cors/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/cors/pubspec.yaml b/packages/cors/pubspec.yaml index 08ca2348..db9f510e 100644 --- a/packages/cors/pubspec.yaml +++ b/packages/cors/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_cors -version: 8.0.0 +version: 8.1.0 description: Angel3 CORS middleware. Ported from expressjs/cors to Angel3 framework. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/cors @@ -10,7 +10,7 @@ dependencies: dev_dependencies: angel3_test: ^8.0.0 http: ^1.0.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_container: diff --git a/packages/framework/CHANGELOG.md b/packages/framework/CHANGELOG.md index a3097776..2579bc79 100644 --- a/packages/framework/CHANGELOG.md +++ b/packages/framework/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.3.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.2.0 * Add `addResponseHeader` to `AngelHttp` to add headers to HTTP default response diff --git a/packages/framework/lib/src/core/anonymous_service.dart b/packages/framework/lib/src/core/anonymous_service.dart index 6c6c3ef1..e43e4f25 100644 --- a/packages/framework/lib/src/core/anonymous_service.dart +++ b/packages/framework/lib/src/core/anonymous_service.dart @@ -1,6 +1,4 @@ import 'dart:async'; -import 'request_context.dart'; -import 'response_context.dart'; import 'service.dart'; /// An easy helper class to create one-off services without having to create an entire class. @@ -22,8 +20,7 @@ class AnonymousService extends Service { FutureOr Function(Id id, Data data, [Map? params])? update, FutureOr Function(Id id, [Map? params])? remove, - FutureOr Function(RequestContext, ResponseContext)? readData}) - : super(readData: readData) { + super.readData}) { _index = index; _read = read; _create = create; diff --git a/packages/framework/lib/src/core/injection.dart b/packages/framework/lib/src/core/injection.dart index b2027173..eb4a0b06 100644 --- a/packages/framework/lib/src/core/injection.dart +++ b/packages/framework/lib/src/core/injection.dart @@ -1,4 +1,4 @@ -part of angel_framework.http.request_context; +part of 'request_context.dart'; const List _primitiveTypes = [String, int, num, double, Null]; diff --git a/packages/framework/lib/src/core/metadata.dart b/packages/framework/lib/src/core/metadata.dart index dfe08a63..a96aac5a 100644 --- a/packages/framework/lib/src/core/metadata.dart +++ b/packages/framework/lib/src/core/metadata.dart @@ -141,40 +141,26 @@ class Parameter { /// Shortcut for declaring a request header [Parameter]. class Header extends Parameter { - const Header(String header, {match, defaultValue, bool required = true}) - : super( - header: header, - match: match, - defaultValue: defaultValue, - required: required); + const Header(String header, {super.match, super.defaultValue, super.required}) + : super(header: header); } /// Shortcut for declaring a request session [Parameter]. class Session extends Parameter { - const Session(String session, {match, defaultValue, bool required = true}) - : super( - session: session, - match: match, - defaultValue: defaultValue, - required: required); + const Session(String session, + {super.match, super.defaultValue, super.required}) + : super(session: session); } /// Shortcut for declaring a request query [Parameter]. class Query extends Parameter { - const Query(String query, {match, defaultValue, bool required = true}) - : super( - query: query, - match: match, - defaultValue: defaultValue, - required: required); + const Query(String query, {super.match, super.defaultValue, super.required}) + : super(query: query); } /// Shortcut for declaring a request cookie [Parameter]. class CookieValue extends Parameter { - const CookieValue(String cookie, {match, defaultValue, bool required = true}) - : super( - cookie: cookie, - match: match, - defaultValue: defaultValue, - required: required); + const CookieValue(String cookie, + {super.match, super.defaultValue, super.required}) + : super(cookie: cookie); } diff --git a/packages/framework/lib/src/http/angel_http.dart b/packages/framework/lib/src/http/angel_http.dart index f17a53af..8568acf3 100644 --- a/packages/framework/lib/src/http/angel_http.dart +++ b/packages/framework/lib/src/http/angel_http.dart @@ -26,8 +26,8 @@ class AngelHttp extends Driver=3.0.0 <4.0.0' dependencies: angel3_framework: ^8.2.0 - angel3_websocket: ^8.0.0 - belatuk_html_builder: ^5.0.0 + angel3_websocket: ^8.1.0 + belatuk_html_builder: ^5.1.0 charcode: ^1.3.0 glob: ^2.1.0 io: ^1.0.0 - path: ^1.8.0 - vm_service: ^13.0.0 + path: ^1.9.0 + vm_service: ^14.0.0 watcher: ^1.0.0 logging: ^1.2.0 dev_dependencies: http: ^1.0.0 - lints: ^2.1.0 + lints: ^3.0.0 #dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/http_exception/CHANGELOG.md b/packages/http_exception/CHANGELOG.md index 7b612a11..c6e2f43a 100644 --- a/packages/http_exception/CHANGELOG.md +++ b/packages/http_exception/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/http_exception/pubspec.yaml b/packages/http_exception/pubspec.yaml index af7f7e6c..e5eec268 100644 --- a/packages/http_exception/pubspec.yaml +++ b/packages/http_exception/pubspec.yaml @@ -1,9 +1,9 @@ name: angel3_http_exception -version: 8.0.0 +version: 8.1.0 description: Exception class that can be serialized to JSON and serialized to clients. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/http_exception environment: sdk: '>=3.0.0 <4.0.0' dev_dependencies: - lints: ^2.1.0 \ No newline at end of file + lints: ^3.0.0 \ No newline at end of file diff --git a/packages/jael/angel_jael/CHANGELOG.md b/packages/jael/angel_jael/CHANGELOG.md index 725d0eb9..405a1e01 100644 --- a/packages/jael/angel_jael/CHANGELOG.md +++ b/packages/jael/angel_jael/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/jael/angel_jael/mono_pkg.yaml b/packages/jael/angel_jael/mono_pkg.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/jael/angel_jael/pubspec.yaml b/packages/jael/angel_jael/pubspec.yaml index d1535b75..fc691e26 100644 --- a/packages/jael/angel_jael/pubspec.yaml +++ b/packages/jael/angel_jael/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_jael -version: 8.0.0 +version: 8.1.0 description: Angel support for the Jael templating engine, similar to Blade or Liquid. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/angel_jael @@ -9,15 +9,15 @@ dependencies: angel3_framework: ^8.0.0 jael3: ^8.0.0 jael3_preprocessor: ^8.0.0 - belatuk_code_buffer: ^5.0.0 - belatuk_symbol_table: ^5.0.0 + belatuk_code_buffer: ^5.1.0 + belatuk_symbol_table: ^5.1.0 file: ^7.0.0 logging: ^1.2.0 dev_dependencies: angel3_test: ^8.0.0 html: ^0.15.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../../container/angel_container diff --git a/packages/jael/jael/CHANGELOG.md b/packages/jael/jael/CHANGELOG.md index 5617672b..a3dddc4f 100644 --- a/packages/jael/jael/CHANGELOG.md +++ b/packages/jael/jael/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/jael/jael/lib/src/text/parselet/infix.dart b/packages/jael/jael/lib/src/text/parselet/infix.dart index 9b5995b9..942cdd51 100644 --- a/packages/jael/jael/lib/src/text/parselet/infix.dart +++ b/packages/jael/jael/lib/src/text/parselet/infix.dart @@ -1,4 +1,4 @@ -part of jael.src.text.parselet; +part of 'parselet.dart'; const Map infixParselets = { TokenType.lParen: CallParselet(), diff --git a/packages/jael/jael/lib/src/text/parselet/prefix.dart b/packages/jael/jael/lib/src/text/parselet/prefix.dart index 34dd230c..7b036692 100644 --- a/packages/jael/jael/lib/src/text/parselet/prefix.dart +++ b/packages/jael/jael/lib/src/text/parselet/prefix.dart @@ -1,4 +1,4 @@ -part of jael.src.text.parselet; +part of 'parselet.dart'; const Map prefixParselets = { TokenType.exclamation: NotParselet(), diff --git a/packages/jael/jael/pubspec.yaml b/packages/jael/jael/pubspec.yaml index 2e0376eb..591fa26a 100644 --- a/packages/jael/jael/pubspec.yaml +++ b/packages/jael/jael/pubspec.yaml @@ -1,5 +1,5 @@ name: jael3 -version: 8.0.0 +version: 8.1.0 description: A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael @@ -8,14 +8,14 @@ environment: dependencies: args: ^2.4.0 charcode: ^1.3.0 - belatuk_code_buffer: ^5.0.0 - belatuk_symbol_table: ^5.0.0 + belatuk_code_buffer: ^5.1.0 + belatuk_symbol_table: ^5.1.0 source_span: ^1.10.0 string_scanner: ^1.2.0 collection: ^1.17.0 matcher: ^0.12.10 dev_dependencies: - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 executables: jaelfmt: jaelfmt \ No newline at end of file diff --git a/packages/jael/jael_language_server/lib/src/analyzer.dart b/packages/jael/jael_language_server/lib/src/analyzer.dart index a00e845c..2f87b933 100644 --- a/packages/jael/jael_language_server/lib/src/analyzer.dart +++ b/packages/jael/jael_language_server/lib/src/analyzer.dart @@ -5,7 +5,7 @@ import 'object.dart'; class Analyzer extends Parser { final Logger logger; - Analyzer(Scanner scanner, this.logger) : super(scanner); + Analyzer(super.scanner, this.logger); //@override //final errors = []; diff --git a/packages/jael/jael_language_server/pubspec.yaml b/packages/jael/jael_language_server/pubspec.yaml index a39f72ed..8f51567e 100644 --- a/packages/jael/jael_language_server/pubspec.yaml +++ b/packages/jael/jael_language_server/pubspec.yaml @@ -1,5 +1,5 @@ name: jael3_language_server -version: 8.0.0 +version: 8.1.0 description: Language Server Protocol implementation for the Jael templating engine. homepage: https://github.com/angel-dart/vscode publish_to: none @@ -18,7 +18,7 @@ dependencies: path: ^1.8.0 source_span: ^1.10.0 string_scanner: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 stream_channel: ^2.1.0 async: ^2.11.0 executables: diff --git a/packages/jael/jael_preprocessor/CHANGELOG.md b/packages/jael/jael_preprocessor/CHANGELOG.md index 62288b60..427006c2 100644 --- a/packages/jael/jael_preprocessor/CHANGELOG.md +++ b/packages/jael/jael_preprocessor/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/jael/jael_preprocessor/pubspec.yaml b/packages/jael/jael_preprocessor/pubspec.yaml index fdf2079e..ff133082 100644 --- a/packages/jael/jael_preprocessor/pubspec.yaml +++ b/packages/jael/jael_preprocessor/pubspec.yaml @@ -1,5 +1,5 @@ name: jael3_preprocessor -version: 8.0.0 +version: 8.1.0 description: A pre-processor for resolving blocks and includes within Jael templates. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor @@ -8,12 +8,12 @@ environment: dependencies: file: ^7.0.0 jael3: ^8.0.0 - belatuk_symbol_table: ^5.0.0 + belatuk_symbol_table: ^5.1.0 collection: ^1.17.0 dev_dependencies: - belatuk_code_buffer: ^5.0.0 + belatuk_code_buffer: ^5.1.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # jael3: # path: ../jael diff --git a/packages/jael/jael_web/CHANGELOG.md b/packages/jael/jael_web/CHANGELOG.md index 29cc7e1a..dd5ed3f4 100644 --- a/packages/jael/jael_web/CHANGELOG.md +++ b/packages/jael/jael_web/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.2.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.1.0 * Upgraded to `analyzer` 6.2.x diff --git a/packages/jael/jael_web/pubspec.yaml b/packages/jael/jael_web/pubspec.yaml index 1e4f5692..63fbc0ee 100644 --- a/packages/jael/jael_web/pubspec.yaml +++ b/packages/jael/jael_web/pubspec.yaml @@ -1,5 +1,5 @@ name: jael3_web -version: 8.1.0 +version: 8.2.0 description: Experimental virtual DOM/SPA engine built on Jael3. Supports SSR. publish_to: none environment: @@ -17,7 +17,7 @@ dependencies: dev_dependencies: build_runner: ^2.4.0 build_web_compilers: ^4.0.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # jael3: # path: ../jael diff --git a/packages/jinja/CHANGELOG.md b/packages/jinja/CHANGELOG.md index 4f0c9763..a72275fc 100644 --- a/packages/jinja/CHANGELOG.md +++ b/packages/jinja/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.2.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.1.0 * Update `jinja` to 0.5.0 diff --git a/packages/jinja/pubspec.yaml b/packages/jinja/pubspec.yaml index 39870eeb..d1a47627 100644 --- a/packages/jinja/pubspec.yaml +++ b/packages/jinja/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_jinja -version: 8.1.0 +version: 8.2.0 description: A service that renders Jinja2 template into HTML view for Angel3. Ported from Python to Dart. homepage: https://github.com/dukefirehawk/angel/tree/master/packages/jinja environment: @@ -9,9 +9,9 @@ dependencies: jinja: ^0.5.0 dev_dependencies: angel3_test: ^8.0.0 - path: ^1.8.0 + path: ^1.9.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/markdown/CHANGELOG.md b/packages/markdown/CHANGELOG.md index 2d74ae5b..3c12173c 100644 --- a/packages/markdown/CHANGELOG.md +++ b/packages/markdown/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/markdown/README.md b/packages/markdown/README.md index 54a9bb1d..e5cbe59f 100644 --- a/packages/markdown/README.md +++ b/packages/markdown/README.md @@ -15,8 +15,8 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^6.0.0 - angel3_markdown: ^6.0.0 + angel3_framework: ^8.0.0 + angel3_markdown: ^8.0.0 ``` ## Usage @@ -33,9 +33,7 @@ configureServer(Angel app) async { } ``` -You can then generate HTML on-the-fly in a request handler. -Assuming your view directory contained a file named `hello.md`, the -following would render it as an HTML response: +You can then generate HTML on-the-fly in a request handler. Assuming your view directory contained a file named `hello.md`, the following would render it as an HTML response: ```dart configureServer(Angel app) async { @@ -48,9 +46,7 @@ you can easily override this. ## Interpolation -`angel3_markdown` can interpolate the values of data from `locals` before building the Markdown. - -For example, with the following template `species.md`: +`angel3_markdown` can interpolate the values of data from `locals` before building the Markdown. For example, with the following template `species.md`: ```markdown # Species: {{species.name}} @@ -96,10 +92,8 @@ configureServer(Angel app) async { } ``` -The `template` function will have access to whatever values were passed to the renderer, -or an empty `Map`. +The `template` function will have access to whatever values were passed to the renderer, or an empty `Map`. ## Enhancing Markdown -You can pass an `extensionSet` to add additional features to the Markdown renderer. -By default, this plug-in configures it to enable Github-flavored Markdown. +You can pass an `extensionSet` to add additional features to the Markdown renderer. By default, this plug-in configures it to enable Github-flavored Markdown. diff --git a/packages/markdown/pubspec.yaml b/packages/markdown/pubspec.yaml index de3df97f..9623b6e0 100644 --- a/packages/markdown/pubspec.yaml +++ b/packages/markdown/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_markdown -version: 8.0.0 +version: 8.1.0 description: Angel3 Markdown view generator. Write static sites, with no build step. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/markdown @@ -11,7 +11,7 @@ dependencies: markdown: ^7.1.0 dev_dependencies: angel3_test: ^8.0.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_container: diff --git a/packages/mock_request/CHANGELOG.md b/packages/mock_request/CHANGELOG.md index d8cc3705..0841f866 100644 --- a/packages/mock_request/CHANGELOG.md +++ b/packages/mock_request/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/mock_request/pubspec.yaml b/packages/mock_request/pubspec.yaml index 1877fa34..993f522c 100644 --- a/packages/mock_request/pubspec.yaml +++ b/packages/mock_request/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_mock_request -version: 8.0.0 +version: 8.1.0 description: Manufacture dart:io HttpRequests, HttpResponses, HttpHeaders, etc. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/mock_request @@ -11,7 +11,7 @@ dev_dependencies: #angel3_framework: ^7.0.0 http: ^1.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_framework: # path: ../framework diff --git a/packages/model/CHANGELOG.md b/packages/model/CHANGELOG.md index a5d38134..40268768 100644 --- a/packages/model/CHANGELOG.md +++ b/packages/model/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed analyser warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/model/example/main.dart b/packages/model/example/main.dart index 81e8f711..d01d5874 100644 --- a/packages/model/example/main.dart +++ b/packages/model/example/main.dart @@ -11,10 +11,9 @@ class Todo extends Model { bool isComplete; Todo( - {required String id, + {required String super.id, this.text, this.isComplete = false, - DateTime? createdAt, - DateTime? updatedAt}) - : super(id: id, createdAt: createdAt, updatedAt: updatedAt); + super.createdAt, + super.updatedAt}); } diff --git a/packages/model/pubspec.yaml b/packages/model/pubspec.yaml index 96e89e4d..ca75ee6d 100644 --- a/packages/model/pubspec.yaml +++ b/packages/model/pubspec.yaml @@ -1,9 +1,9 @@ name: angel3_model -version: 8.0.0 +version: 8.1.0 description: Angel3 basic data model class, no longer with the added weight of the whole framework. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/model environment: sdk: '>=3.0.0 <4.0.0' dev_dependencies: - lints: ^2.1.0 + lints: ^3.0.0 diff --git a/packages/mongo/CHANGELOG.md b/packages/mongo/CHANGELOG.md index bb26b0f9..1c738a12 100644 --- a/packages/mongo/CHANGELOG.md +++ b/packages/mongo/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/mongo/README.md b/packages/mongo/README.md index 90f10de9..100fd535 100644 --- a/packages/mongo/README.md +++ b/packages/mongo/README.md @@ -13,7 +13,7 @@ Add the following to your `pubspec.yaml`: ```yaml dependencies: - angel3_mongo: ^6.0.0 + angel3_mongo: ^8.0.0 ``` ## Usage @@ -22,8 +22,7 @@ This library exposes one main class: `MongoService`. ## Model -`Model` is class with no real functionality; however, it represents a basic document, and your services should host inherited classes. -Other Angel service providers host `Model` as well, so you will easily be able to modify your application if you ever switch databases. +`Model` is class with no real functionality; however, it represents a basic document, and your services should host inherited classes. Other Angel service providers host `Model` as well, so you will easily be able to modify your application if you ever switch databases. ```dart class User extends Model { @@ -51,13 +50,11 @@ This class interacts with a `DbCollection` (from mongo_dart) and serializing dat You can query these services as follows: -```bash +```curl /path/to/service?foo=bar ``` -The above will query the database to find records where 'foo' equals 'bar'. - -The former will sort result in ascending order of creation, and so will the latter. +The above will query the database to find records where 'foo' equals 'bar'. The former will sort result in ascending order of creation, and so will the latter. ```dart List queried = await MyService.index({r"$query": where.id(new ObjectId.fromHexString("some hex string"}))); diff --git a/packages/mongo/lib/mongo_service.dart b/packages/mongo/lib/mongo_service.dart index acb1a469..846e2cc2 100644 --- a/packages/mongo/lib/mongo_service.dart +++ b/packages/mongo/lib/mongo_service.dart @@ -1,4 +1,4 @@ -part of angel3_mongo.services; +part of 'services.dart'; /// Manipulates data from MongoDB as Maps. class MongoService extends Service> { @@ -127,13 +127,13 @@ class MongoService extends Service> { @override Future> read(String id, [Map? params]) async { - var _id = _makeId(id); + var localId = _makeId(id); var found = - await collection.findOne(where.id(_id).and(_makeQuery(params)!)); + await collection.findOne(where.id(localId).and(_makeQuery(params)!)); if (found == null) { throw AngelHttpException.notFound( - message: 'No record found for ID ${_id.toHexString()}'); + message: 'No record found for ID ${localId.toHexString()}'); } return _jsonify(found, params); diff --git a/packages/mongo/pubspec.yaml b/packages/mongo/pubspec.yaml index da46e89e..aed37e8a 100644 --- a/packages/mongo/pubspec.yaml +++ b/packages/mongo/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_mongo -version: 8.0.0 +version: 8.1.0 description: MongoDB-enabled services for the Angel3 framework. Well-tested. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/mongo @@ -7,13 +7,13 @@ environment: sdk: '>=3.0.0 <4.0.0' dependencies: angel3_framework: ^8.0.0 - belatuk_json_serializer: ^7.0.0 - belatuk_merge_map: ^5.0.0 + belatuk_json_serializer: ^7.1.0 + belatuk_merge_map: ^5.1.0 mongo_dart: ^0.9.0 dev_dependencies: http: ^1.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/mustache/CHANGELOG.md b/packages/mustache/CHANGELOG.md index e12ad86a..bccb09b2 100644 --- a/packages/mustache/CHANGELOG.md +++ b/packages/mustache/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/mustache/README.md b/packages/mustache/README.md index 6110c2c7..b4d29bd0 100644 --- a/packages/mustache/README.md +++ b/packages/mustache/README.md @@ -15,7 +15,7 @@ In `pubspec.yaml`: ```yaml dependencies: - angel3_mustache: ^6.0.0 + angel3_mustache: ^8.0.0 ``` ## Usage diff --git a/packages/mustache/pubspec.yaml b/packages/mustache/pubspec.yaml index 103ce2cf..cac41e7a 100644 --- a/packages/mustache/pubspec.yaml +++ b/packages/mustache/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_mustache -version: 8.0.0 +version: 8.1.0 description: A service that renders Mustache template into HTML view for Angel3 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/mustache @@ -13,7 +13,7 @@ dependencies: dev_dependencies: http: ^1.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/oauth2/CHANGELOG.md b/packages/oauth2/CHANGELOG.md index 09a013d3..58f4c5d3 100644 --- a/packages/oauth2/CHANGELOG.md +++ b/packages/oauth2/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/oauth2/README.md b/packages/oauth2/README.md index 4e16a747..04f42ea4 100644 --- a/packages/oauth2/README.md +++ b/packages/oauth2/README.md @@ -5,8 +5,7 @@ [![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) [![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/master/packages/oauth2/LICENSE) -A class containing handlers that can be used within [Angel](https://angel3-framework.web.app/) to build a spec-compliant -OAuth 2.0 server, including PKCE support. +A class containing handlers that can be used within [Angel](https://angel3-framework.web.app/) to build a spec-compliant OAuth 2.0 server, including PKCE support. - [Angel3 OAuth2 Server](#angel3-oauth2-server) - [Installation](#installation) diff --git a/packages/oauth2/lib/src/exception.dart b/packages/oauth2/lib/src/exception.dart index b92536fe..278601d0 100644 --- a/packages/oauth2/lib/src/exception.dart +++ b/packages/oauth2/lib/src/exception.dart @@ -5,12 +5,8 @@ class AuthorizationException extends AngelHttpException { final ErrorResponse errorResponse; AuthorizationException(this.errorResponse, - {StackTrace? stackTrace, int? statusCode, dynamic error}) - : super( - stackTrace: stackTrace, - message: '', - error: error, - statusCode: statusCode ?? 400); + {super.stackTrace, int? statusCode, super.error}) + : super(message: '', statusCode: statusCode ?? 400); @override Map toJson() { diff --git a/packages/oauth2/pubspec.yaml b/packages/oauth2/pubspec.yaml index c889af19..277c2c42 100644 --- a/packages/oauth2/pubspec.yaml +++ b/packages/oauth2/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_oauth2 -version: 8.0.0 +version: 8.1.0 description: A class containing handlers that can be used within Angel to build a spec-compliant OAuth 2.0 server. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/oauth2 @@ -16,7 +16,7 @@ dev_dependencies: angel3_test: ^8.0.0 angel3_container: ^8.0.0 oauth2: ^2.0.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 uuid: ^4.0.0 # dependency_overrides: diff --git a/packages/orm/angel_migration/CHANGELOG.md b/packages/orm/angel_migration/CHANGELOG.md index 37e4aca9..27f9ba60 100755 --- a/packages/orm/angel_migration/CHANGELOG.md +++ b/packages/orm/angel_migration/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_migration/lib/src/column.dart b/packages/orm/angel_migration/lib/src/column.dart index 8d92038f..01d4cf74 100755 --- a/packages/orm/angel_migration/lib/src/column.dart +++ b/packages/orm/angel_migration/lib/src/column.dart @@ -20,14 +20,10 @@ class MigrationColumn extends Column { MigrationColumn(ColumnType type, {bool isNullable = true, - int length = 255, + super.length, IndexType indexType = IndexType.standardIndex, dynamic defaultValue}) - : super( - type: type, - length: length, - isNullable: isNullable, - defaultValue: defaultValue) { + : super(type: type, isNullable: isNullable, defaultValue: defaultValue) { _nullable = isNullable; _index = indexType; _defaultValue = defaultValue; diff --git a/packages/orm/angel_migration/pubspec.yaml b/packages/orm/angel_migration/pubspec.yaml index 2ace5f9d..e6dfe0da 100755 --- a/packages/orm/angel_migration/pubspec.yaml +++ b/packages/orm/angel_migration/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_migration -version: 8.0.0 +version: 8.1.0 description: Database migration runtime for Angel3 ORM. Use this package to define schemas. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_migration @@ -8,7 +8,7 @@ environment: dependencies: angel3_orm: ^8.0.0 dev_dependencies: - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_orm: # path: ../angel_orm diff --git a/packages/orm/angel_migration_runner/CHANGELOG.md b/packages/orm/angel_migration_runner/CHANGELOG.md index 742415a9..258630b0 100755 --- a/packages/orm/angel_migration_runner/CHANGELOG.md +++ b/packages/orm/angel_migration_runner/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_migration_runner/example/todo.dart b/packages/orm/angel_migration_runner/example/todo.dart index bf097dfb..af112445 100644 --- a/packages/orm/angel_migration_runner/example/todo.dart +++ b/packages/orm/angel_migration_runner/example/todo.dart @@ -1,6 +1,3 @@ -/// These are straightforward migrations. -/// -/// You will likely never have to actually write these yourself. import 'package:angel3_migration/angel3_migration.dart'; class UserMigration implements Migration { diff --git a/packages/orm/angel_migration_runner/pubspec.yaml b/packages/orm/angel_migration_runner/pubspec.yaml index 3eb566f6..02f8e0a5 100755 --- a/packages/orm/angel_migration_runner/pubspec.yaml +++ b/packages/orm/angel_migration_runner/pubspec.yaml @@ -1,10 +1,11 @@ name: angel3_migration_runner -version: 8.0.0 +version: 8.1.0 description: Command-line based database migration runner for Angel3's ORM. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_migration_runner environment: sdk: '>=3.0.0 <4.0.0' +publish_to: none dependencies: angel3_migration: ^8.0.0 angel3_orm: ^8.0.0 @@ -15,7 +16,7 @@ dependencies: mysql1: ^0.20.0 logging: ^1.2.0 dev_dependencies: - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_orm: # path: ../angel_orm diff --git a/packages/orm/angel_orm/CHANGELOG.md b/packages/orm/angel_orm/CHANGELOG.md index cb4e48ef..cb0c0f15 100644 --- a/packages/orm/angel_orm/CHANGELOG.md +++ b/packages/orm/angel_orm/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_orm/lib/src/builder.dart b/packages/orm/angel_orm/lib/src/builder.dart index b8eea6a4..bd929eda 100644 --- a/packages/orm/angel_orm/lib/src/builder.dart +++ b/packages/orm/angel_orm/lib/src/builder.dart @@ -30,8 +30,7 @@ class NumericSqlExpressionBuilder String? _raw; T? _value; - NumericSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + NumericSqlExpressionBuilder(super.query, super.columnName); @override bool get hasValue => _hasValue; @@ -123,8 +122,7 @@ class EnumSqlExpressionBuilder extends SqlExpressionBuilder { String? _raw; int? _value; - EnumSqlExpressionBuilder(Query query, String columnName, this._getValue) - : super(query, columnName); + EnumSqlExpressionBuilder(super.query, super.columnName, this._getValue); @override bool get hasValue => _hasValue; @@ -187,8 +185,7 @@ class StringSqlExpressionBuilder extends SqlExpressionBuilder { bool _hasValue = false; String? _op = '=', _raw, _value; - StringSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + StringSqlExpressionBuilder(super.query, super.columnName); @override bool get hasValue => _hasValue; @@ -291,8 +288,7 @@ class BooleanSqlExpressionBuilder extends SqlExpressionBuilder { String? _op = '=', _raw; bool? _value; - BooleanSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + BooleanSqlExpressionBuilder(super.query, super.columnName); @override bool get hasValue => _hasValue; @@ -346,8 +342,7 @@ class DateTimeSqlExpressionBuilder extends SqlExpressionBuilder { String? _raw; - DateTimeSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + DateTimeSqlExpressionBuilder(super.query, super.columnName); NumericSqlExpressionBuilder get year => _year ??= NumericSqlExpressionBuilder(query, 'year'); @@ -468,8 +463,7 @@ abstract class JsonSqlExpressionBuilder extends SqlExpressionBuilder { String? _op; String? _raw; - JsonSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + JsonSqlExpressionBuilder(super.query, super.columnName); JsonSqlExpressionBuilderProperty operator [](K name) { var p = _property(name); @@ -550,8 +544,7 @@ abstract class JsonSqlExpressionBuilder extends SqlExpressionBuilder { } class MapSqlExpressionBuilder extends JsonSqlExpressionBuilder { - MapSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + MapSqlExpressionBuilder(super.query, super.columnName); @override JsonSqlExpressionBuilderProperty _property(String name) { @@ -568,8 +561,7 @@ class MapSqlExpressionBuilder extends JsonSqlExpressionBuilder { } class ListSqlExpressionBuilder extends JsonSqlExpressionBuilder { - ListSqlExpressionBuilder(Query query, String columnName) - : super(query, columnName); + ListSqlExpressionBuilder(super.query, super.columnName); @override List? _encodeValue(List? v) => v; //[json.encode(v)]; diff --git a/packages/orm/angel_orm/pubspec.yaml b/packages/orm/angel_orm/pubspec.yaml index ee86b5bf..87e877a4 100644 --- a/packages/orm/angel_orm/pubspec.yaml +++ b/packages/orm/angel_orm/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_orm -version: 8.0.0 +version: 8.1.0 description: Runtime support for Angel3 ORM. Includes base classes for queries. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm @@ -7,7 +7,7 @@ environment: sdk: '>=3.0.0 <4.0.0' dependencies: charcode: ^1.3.0 - intl: ^0.18.0 + intl: ^0.19.0 meta: ^1.9.0 string_scanner: ^1.2.0 optional: ^6.1.0 @@ -18,7 +18,7 @@ dev_dependencies: angel3_serialize_generator: ^8.0.0 build_runner: ^2.4.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_serialize: # path: ../../serialize/angel_serialize diff --git a/packages/orm/angel_orm_generator/CHANGELOG.md b/packages/orm/angel_orm_generator/CHANGELOG.md index 8b930979..7cec11ce 100644 --- a/packages/orm/angel_orm_generator/CHANGELOG.md +++ b/packages/orm/angel_orm_generator/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.2.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.1.0 * Upgraded to `analyzer` 6.2.x diff --git a/packages/orm/angel_orm_generator/pubspec.yaml b/packages/orm/angel_orm_generator/pubspec.yaml index 643535eb..7fa1e2d5 100644 --- a/packages/orm/angel_orm_generator/pubspec.yaml +++ b/packages/orm/angel_orm_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_orm_generator -version: 8.1.0 +version: 8.2.0 description: Code generators for Angel3 ORM. Generates query builder classes. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_generator @@ -27,9 +27,8 @@ dev_dependencies: angel3_framework: ^8.0.0 angel3_migration: ^8.0.0 build_runner: ^2.4.0 - postgres: ^2.4.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 #dependency_overrides: # angel3_container: # path: ../../container/angel_container diff --git a/packages/orm/angel_orm_mysql/CHANGELOG.md b/packages/orm/angel_orm_mysql/CHANGELOG.md index 70ffd023..aa5a628f 100644 --- a/packages/orm/angel_orm_mysql/CHANGELOG.md +++ b/packages/orm/angel_orm_mysql/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_orm_mysql/README.md b/packages/orm/angel_orm_mysql/README.md index 75211981..c16921ea 100644 --- a/packages/orm/angel_orm_mysql/README.md +++ b/packages/orm/angel_orm_mysql/README.md @@ -5,7 +5,7 @@ [![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) [![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_mysql/LICENSE) -This package contains the SQL executor required by Angel3 ORM to work with MySQL and MariaDB respectively. In order to better support both MySQL and MariaDB, two different flavors of drives have been included; `mysql_client` and `mysql1`. They are implmented as `MySqlExecutor` and `MariaDbExecutor` respectively. +This package contains the SQL executor required by Angel3 ORM to work with MySQL or MariaDB. In order to better support both MySQL and MariaDB, two different flavors of drives have been included; `mysql_client` and `mysql1`. They are implmented as `MySqlExecutor` and `MariaDbExecutor` respectively. ## Supported databases @@ -73,23 +73,23 @@ This SQL executor is implemented using [`mysql1`](https://pub.dev/packages?q=mys 1. Login to MariaDB/MySQL database console with the following command. -```bash - mysql -u root -p -``` + ```bash + mysql -u root -p + ``` -1. Run the following commands to create a new database, `orm_test` and grant both local and remote access to user, `test`. Replace `orm_test`, `test` and `test123` with your own database name, username and password respectively. +2. Run the following commands to create a new database, `orm_test`, and grant both local and remote access to user, `test`. Replace `orm_test`, `test` and `test123` with your own database name, username and password. -```mysql - create database orm_test; - - -- Granting localhost access only - create user 'test'@'localhost' identified by 'test123'; - grant all privileges on orm_test.* to 'test'@'localhost'; + ```mysql + create database orm_test; + + -- Granting localhost access only + create user 'test'@'localhost' identified by 'test123'; + grant all privileges on orm_test.* to 'test'@'localhost'; - -- Granting localhost and remote access - create user 'test'@'%' identified by 'test123'; - grant all privileges on orm_test.* to 'test'@'%'; -``` + -- Granting localhost and remote access + create user 'test'@'%' identified by 'test123'; + grant all privileges on orm_test.* to 'test'@'%'; + ``` ## Compatibility Matrix diff --git a/packages/orm/angel_orm_mysql/pubspec.yaml b/packages/orm/angel_orm_mysql/pubspec.yaml index 805a9778..7798f605 100644 --- a/packages/orm/angel_orm_mysql/pubspec.yaml +++ b/packages/orm/angel_orm_mysql/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_orm_mysql -version: 8.0.0 +version: 8.1.0 description: MySQL support for Angel3 ORM. Includes functionality for querying and transactions. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_mysql @@ -16,7 +16,7 @@ dev_dependencies: angel3_orm_test: ^8.0.0 build_runner: ^2.4.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_serialize: diff --git a/packages/orm/angel_orm_postgres/CHANGELOG.md b/packages/orm/angel_orm_postgres/CHANGELOG.md index ed836eba..b9c56aa3 100644 --- a/packages/orm/angel_orm_postgres/CHANGELOG.md +++ b/packages/orm/angel_orm_postgres/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml index 4df3d071..9c82b49f 100644 --- a/packages/orm/angel_orm_postgres/pubspec.yaml +++ b/packages/orm/angel_orm_postgres/pubspec.yaml @@ -1,8 +1,9 @@ name: angel3_orm_postgres -version: 8.0.0 +version: 8.1.0 description: PostgreSQL support for Angel3 ORM. Includes functionality for querying and transactions. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_postgres +publish_to: none environment: sdk: '>=3.0.0 <4.0.0' dependencies: @@ -12,11 +13,11 @@ dependencies: postgres: ^2.6.1 postgres_pool: ^2.1.6 dev_dependencies: - belatuk_pretty_logging: ^6.0.0 + belatuk_pretty_logging: ^6.1.0 angel3_orm_generator: ^8.0.0 angel3_orm_test: ^8.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_serialize: # path: ../../serialize/angel_serialize diff --git a/packages/orm/angel_orm_service/CHANGELOG.md b/packages/orm/angel_orm_service/CHANGELOG.md index 14562707..dd40f2b3 100644 --- a/packages/orm/angel_orm_service/CHANGELOG.md +++ b/packages/orm/angel_orm_service/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_orm_service/README.md b/packages/orm/angel_orm_service/README.md index bbd3926c..bf19e81e 100644 --- a/packages/orm/angel_orm_service/README.md +++ b/packages/orm/angel_orm_service/README.md @@ -13,7 +13,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_orm_service: ^6.0.0 + angel3_orm_service: ^8.0.0 ``` ## Usage diff --git a/packages/orm/angel_orm_service/mono_pkg.yaml b/packages/orm/angel_orm_service/mono_pkg.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/orm/angel_orm_service/pubspec.yaml b/packages/orm/angel_orm_service/pubspec.yaml index b9b225df..87abb0ae 100644 --- a/packages/orm/angel_orm_service/pubspec.yaml +++ b/packages/orm/angel_orm_service/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_orm_service -version: 8.0.0 +version: 8.1.0 description: Service implementation that wraps over Angel3 ORM Query classes. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_service @@ -19,7 +19,7 @@ dev_dependencies: build_runner: ^2.4.0 logging: ^1.2.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../../container/angel_container diff --git a/packages/orm/angel_orm_test/CHANGELOG.md b/packages/orm/angel_orm_test/CHANGELOG.md index bdbb50d6..63a7f643 100644 --- a/packages/orm/angel_orm_test/CHANGELOG.md +++ b/packages/orm/angel_orm_test/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/orm/angel_orm_test/pubspec.yaml b/packages/orm/angel_orm_test/pubspec.yaml index 6134d689..b4815b05 100644 --- a/packages/orm/angel_orm_test/pubspec.yaml +++ b/packages/orm/angel_orm_test/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_orm_test -version: 8.0.0 +version: 8.1.0 description: Common tests for Angel3 ORM. Reference implmentation of the generated ORM files. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_test @@ -18,7 +18,7 @@ dev_dependencies: angel3_orm_generator: ^8.0.0 angel3_framework: ^8.0.0 build_runner: ^2.4.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../../container/angel_container diff --git a/packages/production/CHANGELOG.md b/packages/production/CHANGELOG.md index 99f627e3..7d2419bb 100644 --- a/packages/production/CHANGELOG.md +++ b/packages/production/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 8.2.0 + +* Updated `lints` to 3.0.0 +* Updated `intl` to 0.19.0 +* Fixed linter warnings + ## 8.1.0 * Added optional `responseHeaders` and `removeResponseHeaders` to `Runner` diff --git a/packages/production/lib/src/runner.dart b/packages/production/lib/src/runner.dart index 8d228fe1..7a7c4037 100644 --- a/packages/production/lib/src/runner.dart +++ b/packages/production/lib/src/runner.dart @@ -114,7 +114,6 @@ class Runner { onError: onError.sendPort, errorsAreFatal: true && false) .then((isolate) {}) - //.catchError(c.completeError); .catchError((e) { c.completeError(e as Object); return null; @@ -192,7 +191,8 @@ class Runner { server = Server([adapter]); // Register clients - for (var i = 0; i < Platform.numberOfProcessors; i++) { + // for (var i = 0; i < Platform.numberOfProcessors; i++) { + for (var i = 0; i < options.concurrency; i++) { server.registerClient(ClientInfo('client$i')); } @@ -248,13 +248,15 @@ class Runner { if (args.options.ssl || args.options.http2) { securityContext = SecurityContext(); - if (args.options.certificateFile != null) { - securityContext.useCertificateChain(args.options.certificateFile!, + var certificateFile = args.options.certificateFile; + if (certificateFile != null) { + securityContext.useCertificateChain(certificateFile, password: args.options.certificatePassword); } - if (args.options.keyFile != null) { - securityContext.usePrivateKey(args.options.keyFile!, + var keyFile = args.options.keyFile; + if (keyFile != null) { + securityContext.usePrivateKey(keyFile, password: args.options.keyPassword); } } diff --git a/packages/production/pubspec.yaml b/packages/production/pubspec.yaml index 5884daf8..1a06e54b 100644 --- a/packages/production/pubspec.yaml +++ b/packages/production/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_production -version: 8.1.0 +version: 8.2.0 description: Helpers for concurrency, message-passing, rotating loggers, and other production functionality in Angel3. homepage: https://angel3-framework.web.app repository: https://github.com/dukefirehawk/angel/tree/master/packages/production @@ -8,13 +8,13 @@ environment: dependencies: angel3_container: ^8.0.0 angel3_framework: ^8.2.0 - belatuk_pub_sub: ^6.0.0 + belatuk_pub_sub: ^6.1.0 args: ^2.4.0 io: ^1.0.0 logging: ^1.2.0 - intl: ^0.18.0 + intl: ^0.19.0 dev_dependencies: - lints: ^2.1.0 + lints: ^3.0.0 #dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/proxy/CHANGELOG.md b/packages/proxy/CHANGELOG.md index 8c7a6ec0..b8518567 100644 --- a/packages/proxy/CHANGELOG.md +++ b/packages/proxy/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/proxy/README.md b/packages/proxy/README.md index 1c3ac7a2..6cf87944 100644 --- a/packages/proxy/README.md +++ b/packages/proxy/README.md @@ -33,6 +33,4 @@ Also, you can map requests to a root path on the remote server: Proxy(baseUrl.replace(path: '/path')); ``` -Request bodies will be forwarded as well, if they are not empty. This allows things like POST requests to function. - -For a request body to be forwarded, the body must not have already been parsed. +Request bodies will be forwarded as well, if they are not empty. This allows things like POST requests to function. For a request body to be forwarded, the body must not have already been parsed. diff --git a/packages/proxy/pubspec.yaml b/packages/proxy/pubspec.yaml index 4bb0a946..fb56e3ce 100644 --- a/packages/proxy/pubspec.yaml +++ b/packages/proxy/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_proxy -version: 8.0.0 +version: 8.1.0 description: Angel middleware to forward requests to another server (i.e. pub serve). homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/proxy @@ -9,12 +9,12 @@ dependencies: angel3_framework: ^8.0.0 http: ^1.0.0 http_parser: ^4.0.0 - path: ^1.8.0 + path: ^1.9.0 dev_dependencies: angel3_test: ^8.0.0 angel3_mock_request: ^8.0.0 logging: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_framework: diff --git a/packages/redis/CHANGELOG.md b/packages/redis/CHANGELOG.md index 56a9f066..8c6296b7 100644 --- a/packages/redis/CHANGELOG.md +++ b/packages/redis/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/redis/README.md b/packages/redis/README.md index 384603c3..09500c9c 100644 --- a/packages/redis/README.md +++ b/packages/redis/README.md @@ -17,8 +17,8 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^6.0.0 - angel3_redis: ^6.0.0 + angel3_framework: ^8.0.0 + angel3_redis: ^8.0.0 ``` ## Usage diff --git a/packages/redis/pubspec.yaml b/packages/redis/pubspec.yaml index 9c5e3151..1151c104 100644 --- a/packages/redis/pubspec.yaml +++ b/packages/redis/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_redis -version: 8.0.0 +version: 8.1.0 description: An Angel3 service provider for Redis. Works well for caching volatile data. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/redis @@ -11,7 +11,7 @@ dependencies: resp_client: ^1.2.0 dev_dependencies: test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_framework: # path: ../framework diff --git a/packages/route/CHANGELOG.md b/packages/route/CHANGELOG.md index f6568936..96328050 100644 --- a/packages/route/CHANGELOG.md +++ b/packages/route/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed analyser warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/route/lib/src/grammar.dart b/packages/route/lib/src/grammar.dart index f9c818e3..ecacb589 100644 --- a/packages/route/lib/src/grammar.dart +++ b/packages/route/lib/src/grammar.dart @@ -1,4 +1,4 @@ -part of angel3_route.src.router; +part of 'router.dart'; class RouteGrammar { static const String notSlashRgx = r'([^/]+)'; diff --git a/packages/route/lib/src/route.dart b/packages/route/lib/src/route.dart index 225bd479..08c99bc4 100644 --- a/packages/route/lib/src/route.dart +++ b/packages/route/lib/src/route.dart @@ -1,4 +1,4 @@ -part of angel3_route.src.router; +part of 'router.dart'; /// Represents a virtual location within an application. class Route { diff --git a/packages/route/lib/src/routing_result.dart b/packages/route/lib/src/routing_result.dart index 7bb7b830..50edfeae 100644 --- a/packages/route/lib/src/routing_result.dart +++ b/packages/route/lib/src/routing_result.dart @@ -1,4 +1,4 @@ -part of angel3_route.src.router; +part of 'router.dart'; /// Represents a complex result of navigating to a path. class RoutingResult { diff --git a/packages/route/lib/src/symlink_route.dart b/packages/route/lib/src/symlink_route.dart index 2ee87201..cf46966e 100644 --- a/packages/route/lib/src/symlink_route.dart +++ b/packages/route/lib/src/symlink_route.dart @@ -1,9 +1,8 @@ -part of angel3_route.src.router; +part of 'router.dart'; /// Placeholder [Route] to serve as a symbolic link /// to a mounted [Router]. class SymlinkRoute extends Route { final Router router; - SymlinkRoute(String path, this.router) - : super(path, method: 'GET', handlers: []); + SymlinkRoute(super.path, this.router) : super(method: 'GET', handlers: []); } diff --git a/packages/route/pubspec.yaml b/packages/route/pubspec.yaml index fec9b417..b53d7c7c 100644 --- a/packages/route/pubspec.yaml +++ b/packages/route/pubspec.yaml @@ -1,12 +1,12 @@ name: angel3_route -version: 8.0.0 +version: 8.1.0 description: A powerful, isomorphic routing library for Dart. It is mainly used in the Angel3 framework, but can be used in Flutter and on the Web. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/route environment: sdk: '>=3.0.0 <4.0.0' dependencies: - belatuk_combinator: ^5.0.0 + belatuk_combinator: ^5.1.0 string_scanner: ^1.2.0 path: ^1.8.0 dev_dependencies: @@ -14,4 +14,4 @@ dev_dependencies: build_web_compilers: ^4.0.0 http: ^1.0.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 diff --git a/packages/security/CHANGELOG.md b/packages/security/CHANGELOG.md index d1845040..0f0c3e73 100644 --- a/packages/security/CHANGELOG.md +++ b/packages/security/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/security/README.md b/packages/security/README.md index d01b2d27..28c3832b 100644 --- a/packages/security/README.md +++ b/packages/security/README.md @@ -7,4 +7,4 @@ Angel3 middleware designed to enhance application security by patching common Web security holes. -**This package is currently going through a major overhaul, for version 2.** +**This package will undergo a major refactoring.** diff --git a/packages/security/lib/src/in_memory_rate_limiter.dart b/packages/security/lib/src/in_memory_rate_limiter.dart index c3da41fc..8ef91d22 100644 --- a/packages/security/lib/src/in_memory_rate_limiter.dart +++ b/packages/security/lib/src/in_memory_rate_limiter.dart @@ -11,9 +11,8 @@ class InMemoryRateLimiter extends RateLimiter { final _cache = >{}; InMemoryRateLimiter( - int maxPointsPerWindow, Duration windowDuration, this.getUser, - {String? errorMessage}) - : super(maxPointsPerWindow, windowDuration, errorMessage: errorMessage); + super.maxPointsPerWindow, super.windowDuration, this.getUser, + {super.errorMessage}); @override FutureOr> getCurrentWindow( diff --git a/packages/security/lib/src/service_rate_limiter.dart b/packages/security/lib/src/service_rate_limiter.dart index 85ea0e01..ee259059 100644 --- a/packages/security/lib/src/service_rate_limiter.dart +++ b/packages/security/lib/src/service_rate_limiter.dart @@ -13,9 +13,8 @@ class ServiceRateLimiter extends RateLimiter { final FutureOr Function(RequestContext, ResponseContext) getId; ServiceRateLimiter( - int maxPointsPerWindow, Duration windowDuration, this.service, this.getId, - {String? errorMessage}) - : super(maxPointsPerWindow, windowDuration, errorMessage: errorMessage); + super.maxPointsPerWindow, super.windowDuration, this.service, this.getId, + {super.errorMessage}); @override FutureOr> getCurrentWindow( diff --git a/packages/security/pubspec.yaml b/packages/security/pubspec.yaml index fe70bd72..fdb2dc75 100644 --- a/packages/security/pubspec.yaml +++ b/packages/security/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_security -version: 8.0.0 +version: 8.1.0 description: Angel3 infrastructure for improving security, rate limiting, and more homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/security @@ -14,11 +14,11 @@ dev_dependencies: angel3_redis: ^8.0.0 angel3_test: ^8.0.0 angel3_validate: ^8.0.0 - belatuk_pretty_logging: ^6.0.0 + belatuk_pretty_logging: ^6.1.0 test: ^1.24.0 logging: ^1.2.0 resp_client: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_production: # path: ../production diff --git a/packages/sembast/CHANGELOG.md b/packages/sembast/CHANGELOG.md index fca95e3f..d1b3d9fb 100644 --- a/packages/sembast/CHANGELOG.md +++ b/packages/sembast/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/sembast/README.md b/packages/sembast/README.md index 34ccffd1..1dbed5cd 100644 --- a/packages/sembast/README.md +++ b/packages/sembast/README.md @@ -13,7 +13,7 @@ Add the following to your `pubspec.yaml`: ```yaml dependencies: - angel3_sembast: ^6.0.0 + angel3_sembast: ^8.0.0 ``` ## Usage @@ -28,7 +28,7 @@ This class interacts with a `Database` and `Store` (from `package:sembast`) and You can query these services as follows: -```dart +```curl /path/to/service?foo=bar ``` diff --git a/packages/sembast/pubspec.yaml b/packages/sembast/pubspec.yaml index 4954e75b..1595852f 100644 --- a/packages/sembast/pubspec.yaml +++ b/packages/sembast/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_sembast -version: 8.0.0 +version: 8.1.0 description: A plugin service that persist data to Sembast for Angel3 framework. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/sembast @@ -11,7 +11,7 @@ dependencies: dev_dependencies: angel3_http_exception: ^8.0.0 logging: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_framework: diff --git a/packages/seo/CHANGELOG.md b/packages/seo/CHANGELOG.md index 7d3ae997..b35457ef 100644 --- a/packages/seo/CHANGELOG.md +++ b/packages/seo/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/seo/pubspec.yaml b/packages/seo/pubspec.yaml index d139cfd5..7e771e51 100644 --- a/packages/seo/pubspec.yaml +++ b/packages/seo/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_seo -version: 8.0.0 +version: 8.1.0 description: Helper infrastructure for building SEO-friendly Web backends in Angel3. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/seo @@ -11,12 +11,12 @@ dependencies: file: ^7.0.0 html: ^0.15.0 http_parser: ^4.0.0 - path: ^1.8.0 + path: ^1.9.0 dev_dependencies: angel3_test: ^8.0.0 logging: ^1.2.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_static: # path: ../static diff --git a/packages/serialize/angel_serialize/CHANGELOG.md b/packages/serialize/angel_serialize/CHANGELOG.md index 26b8a2c6..44eea0fa 100644 --- a/packages/serialize/angel_serialize/CHANGELOG.md +++ b/packages/serialize/angel_serialize/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/serialize/angel_serialize/lib/angel3_serialize.dart b/packages/serialize/angel_serialize/lib/angel3_serialize.dart index 577219e7..cba003a6 100644 --- a/packages/serialize/angel_serialize/lib/angel3_serialize.dart +++ b/packages/serialize/angel_serialize/lib/angel3_serialize.dart @@ -6,11 +6,8 @@ export 'package:quiver/core.dart' show hashObjects; /// Excludes a field from being excluded. class Exclude extends SerializableField { - const Exclude({bool canDeserialize = false, bool canSerialize = false}) - : super( - exclude: true, - canDeserialize: canDeserialize, - canSerialize: canSerialize); + const Exclude({super.canDeserialize, super.canSerialize}) + : super(exclude: true); } /// No longer necessary, as this is the default. diff --git a/packages/serialize/angel_serialize/pubspec.yaml b/packages/serialize/angel_serialize/pubspec.yaml index 114fcf2a..26f556b7 100644 --- a/packages/serialize/angel_serialize/pubspec.yaml +++ b/packages/serialize/angel_serialize/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_serialize -version: 8.0.0 +version: 8.1.0 description: Static annotations powering Angel3 model serialization. Combine with angel3_serialize_generator for flexible modeling. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/serialize/angel_serialize @@ -11,7 +11,7 @@ dependencies: meta: ^1.9.0 quiver: ^3.2.0 dev_dependencies: - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_model: # path: ../../model diff --git a/packages/serialize/angel_serialize_generator/CHANGELOG.md b/packages/serialize/angel_serialize_generator/CHANGELOG.md index 4baa88e3..b042d900 100644 --- a/packages/serialize/angel_serialize_generator/CHANGELOG.md +++ b/packages/serialize/angel_serialize_generator/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.2.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.1.0 * Upgraded to `analyzer` 6.2.x diff --git a/packages/serialize/angel_serialize_generator/lib/build_context.dart b/packages/serialize/angel_serialize_generator/lib/build_context.dart index fe9eb120..00f7e6b1 100644 --- a/packages/serialize/angel_serialize_generator/lib/build_context.dart +++ b/packages/serialize/angel_serialize_generator/lib/build_context.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; +// ignore: implementation_imports import 'package:analyzer/src/dart/element/element.dart'; import 'package:angel3_serialize/angel3_serialize.dart'; import 'package:build/build.dart'; diff --git a/packages/serialize/angel_serialize_generator/lib/model.dart b/packages/serialize/angel_serialize_generator/lib/model.dart index 3285cb5e..8588a423 100644 --- a/packages/serialize/angel_serialize_generator/lib/model.dart +++ b/packages/serialize/angel_serialize_generator/lib/model.dart @@ -1,4 +1,4 @@ -part of angel3_serialize_generator; +part of 'angel3_serialize_generator.dart'; class JsonModelGenerator extends GeneratorForAnnotation { const JsonModelGenerator(); diff --git a/packages/serialize/angel_serialize_generator/lib/serialize.dart b/packages/serialize/angel_serialize_generator/lib/serialize.dart index 9bec3a97..f7fa2328 100644 --- a/packages/serialize/angel_serialize_generator/lib/serialize.dart +++ b/packages/serialize/angel_serialize_generator/lib/serialize.dart @@ -1,4 +1,4 @@ -part of angel3_serialize_generator; +part of 'angel3_serialize_generator.dart'; class SerializerGenerator extends GeneratorForAnnotation { final bool autoSnakeCaseNames; diff --git a/packages/serialize/angel_serialize_generator/lib/typescript.dart b/packages/serialize/angel_serialize_generator/lib/typescript.dart index 45bbf304..6aebfa81 100644 --- a/packages/serialize/angel_serialize_generator/lib/typescript.dart +++ b/packages/serialize/angel_serialize_generator/lib/typescript.dart @@ -1,4 +1,4 @@ -part of angel3_serialize_generator; +part of 'angel3_serialize_generator.dart'; class TypeScriptDefinitionBuilder implements Builder { final bool autoSnakeCaseNames; diff --git a/packages/serialize/angel_serialize_generator/pubspec.yaml b/packages/serialize/angel_serialize_generator/pubspec.yaml index 571651d2..a460d709 100644 --- a/packages/serialize/angel_serialize_generator/pubspec.yaml +++ b/packages/serialize/angel_serialize_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_serialize_generator -version: 8.1.0 +version: 8.2.0 description: Angel3 model serialization generators, designed for use with Angel. Combine with angel_serialize for flexible modeling. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/serialize/angel_serialize_generator @@ -9,12 +9,12 @@ dependencies: analyzer: ^6.2.0 angel3_model: ^8.0.0 angel3_serialize: ^8.0.0 - belatuk_code_buffer: ^5.0.0 + belatuk_code_buffer: ^5.1.0 build: ^2.0.1 build_config: ^1.0.0 code_builder: ^4.0.0 meta: ^1.9.0 - path: ^1.8.0 + path: ^1.9.0 recase: ^4.0.0 source_gen: ^1.0.0 quiver: ^3.0.1 @@ -22,7 +22,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.1 collection: ^1.17.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_model: diff --git a/packages/shelf/CHANGELOG.md b/packages/shelf/CHANGELOG.md index 5dc3e1bb..c79a21bb 100644 --- a/packages/shelf/CHANGELOG.md +++ b/packages/shelf/CHANGELOG.md @@ -3,6 +3,8 @@ ## 8.0.0 * Require Dart >= 3.0 +* Updated `lints` to 3.0.0 +* Fixed linter warnings ## 7.0.0-beta.2 diff --git a/packages/shelf/README.md b/packages/shelf/README.md index e4b7995d..93e31878 100644 --- a/packages/shelf/README.md +++ b/packages/shelf/README.md @@ -7,14 +7,7 @@ **Replacement of `package:angel_shelf` with breaking changes to support NNBD.** -Shelf interop with Angel3. This package lets you run `package:shelf` handlers via a custom adapter. - -Use the code in this repo to embed existing Angel/shelf apps into -other Angel/shelf applications. This way, you can migrate legacy applications without -having to rewrite your business logic. - -This will make it easy to layer your API over a production application, -rather than having to port code. +Shelf interop with Angel3. This package lets you run `package:shelf` handlers via a custom adapter. Use the code in this repo to embed existing Angel/shelf apps into other Angel/shelf applications. This way, you can migrate legacy applications without having to rewrite your business logic. This will make it easy to layer your API over a production application, rather than having to port code. - [Angel3 Shelf](#angel3-shelf) - [Usage](#usage) @@ -61,7 +54,7 @@ void main() async { ### Communicating with Angel with embedShelf -You can communicate with Angel: +You can communicate with Angel3: ```dart handleRequest(shelf.Request request) { @@ -79,9 +72,7 @@ handleRequest(shelf.Request request) { ### AngelShelf -Angel 2 brought about the generic `Driver` class, which is implemented by `AngelHttp`, `AngelHttp2`, `AngelGopher`, etc., and provides the core infrastructure for request handling in Angel. - -`AngelShelf` is an implementation that wraps shelf requests and responses in their Angel equivalents. Using it is as simple using as using `AngelHttp`, or any other driver: +Angel3 brought about the generic `Driver` class, which is implemented by `AngelHttp`, `AngelHttp2`, `AngelGopher`, etc., and provides the core infrastructure for request handling in Angel. `AngelShelf` is an implementation that wraps shelf requests and responses in their Angel equivalents. Using it is as simple using as using `AngelHttp`, or any other driver: ```dart // Create an AngelShelf driver. diff --git a/packages/shelf/pubspec.yaml b/packages/shelf/pubspec.yaml index dcb44e4f..df8bbbb2 100644 --- a/packages/shelf/pubspec.yaml +++ b/packages/shelf/pubspec.yaml @@ -5,12 +5,12 @@ homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/shelf environment: sdk: '>=3.0.0 <4.0.0' -published_to: none +publish_to: none dependencies: angel3_framework: ^8.0.0 angel3_container: ^8.0.0 angel3_mock_request: ^8.0.0 - path: ^1.8.0 + path: ^1.9.0 shelf: ^1.3.0 stream_channel: ^2.1.0 logging: ^1.2.0 @@ -18,10 +18,10 @@ dependencies: http: ^1.0.0 dev_dependencies: angel3_test: ^8.0.0 - belatuk_pretty_logging: ^6.0.0 + belatuk_pretty_logging: ^6.1.0 shelf_static: ^1.1.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_test: # path: ../test diff --git a/packages/static/CHANGELOG.md b/packages/static/CHANGELOG.md index c015113a..d676dad3 100644 --- a/packages/static/CHANGELOG.md +++ b/packages/static/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/static/lib/src/cache.dart b/packages/static/lib/src/cache.dart index 7ceb62f7..733e17f3 100644 --- a/packages/static/lib/src/cache.dart +++ b/packages/static/lib/src/cache.dart @@ -28,26 +28,19 @@ class CachingVirtualDirectory extends VirtualDirectory { /// Set this to `null` to leave no `Expires` header on responses. final int maxAge; - CachingVirtualDirectory(Angel app, FileSystem fileSystem, + CachingVirtualDirectory(super.app, super.fileSystem, {this.accessLevel = CacheAccessLevel.public, - Directory? source, + super.source, bool debug = false, - Iterable indexFileNames = const ['index.html'], + super.indexFileNames, this.maxAge = 0, this.noCache = false, this.onlyInProduction = false, this.useEtags = true, - bool allowDirectoryListing = false, - bool useBuffer = false, - String publicPath = '/', - Function(File file, RequestContext req, ResponseContext res)? callback}) - : super(app, fileSystem, - source: source, - indexFileNames: indexFileNames, - publicPath: publicPath, - callback: callback, - allowDirectoryListing: allowDirectoryListing, - useBuffer: useBuffer); + super.allowDirectoryListing, + super.useBuffer, + super.publicPath, + super.callback}); @override Future serveFile( diff --git a/packages/static/pubspec.yaml b/packages/static/pubspec.yaml index db6f2692..ac425bf9 100644 --- a/packages/static/pubspec.yaml +++ b/packages/static/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_static -version: 8.0.0 +version: 8.1.0 description: This library provides a virtual directory to serve static files for Angel3 framework. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/static @@ -7,18 +7,18 @@ environment: sdk: '>=3.0.0 <4.0.0' dependencies: angel3_framework: ^8.0.0 - belatuk_range_header: ^6.0.0 + belatuk_range_header: ^6.1.0 convert: ^3.0.0 crypto: ^3.0.1 file: ^7.0.0 http_parser: ^4.0.0 - path: ^1.8.0 + path: ^1.9.0 logging: ^1.2.0 dev_dependencies: angel3_test: ^8.0.0 http: ^1.0.0 matcher: ^0.12.10 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_container: diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md index 04864f14..a2a0fcd2 100644 --- a/packages/sync/CHANGELOG.md +++ b/packages/sync/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/sync/README.md b/packages/sync/README.md index 6f988d9b..304e7b64 100644 --- a/packages/sync/README.md +++ b/packages/sync/README.md @@ -9,10 +9,7 @@ Easily synchronize and scale WebSockets using [belatuk_pub_sub](= 3.0 diff --git a/packages/user_agent/angel_user_agent/pubspec.yaml b/packages/user_agent/angel_user_agent/pubspec.yaml index e5d04d37..803150a3 100644 --- a/packages/user_agent/angel_user_agent/pubspec.yaml +++ b/packages/user_agent/angel_user_agent/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_user_agent -version: 8.0.0 +version: 8.1.0 description: Angel3 middleware to parse and inject a User Agent object into requests. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/user_agent/angel_user_agent @@ -8,7 +8,7 @@ environment: dependencies: angel3_framework: ^8.0.0 user_agent_analyzer: ^5.0.0 - lints: ^2.1.0 + lints: ^3.0.0 # dependency_overrides: # angel3_container: # path: ../../container/angel_container diff --git a/packages/validate/CHANGELOG.md b/packages/validate/CHANGELOG.md index 31b2c328..cbccc5b5 100644 --- a/packages/validate/CHANGELOG.md +++ b/packages/validate/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 + ## 8.0.2 * Fixed incorrect mismatch message handling diff --git a/packages/validate/pubspec.yaml b/packages/validate/pubspec.yaml index 44515cd3..3bc4a6da 100644 --- a/packages/validate/pubspec.yaml +++ b/packages/validate/pubspec.yaml @@ -1,6 +1,6 @@ name: angel3_validate description: Cross-platform HTTP request body validator library based on `matcher`. -version: 8.0.2 +version: 8.1.0 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/validate environment: @@ -14,7 +14,7 @@ dev_dependencies: build_runner: ^2.4.0 build_web_compilers: ^4.0.0 logging: ^1.2.0 - lints: ^2.1.0 + lints: ^3.0.0 test: ^1.24.0 # dependency_overrides: # angel3_container: diff --git a/packages/websocket/CHANGELOG.md b/packages/websocket/CHANGELOG.md index 6bc6d1bd..e4065752 100644 --- a/packages/websocket/CHANGELOG.md +++ b/packages/websocket/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 8.1.0 + +* Updated `lints` to 3.0.0 +* Fixed linter warnings +* Updated `web_socket_channel` to versions below 2.4.1 temporarily. Starting with 2.4.1, its dependency on `dart:html` has been changed to `package:web` which requires a code refactoring to resolve. + ## 8.0.0 * Require Dart >= 3.0 diff --git a/packages/websocket/lib/base_websocket_client.dart b/packages/websocket/lib/base_websocket_client.dart index eeae52f0..f0edd7f4 100644 --- a/packages/websocket/lib/base_websocket_client.dart +++ b/packages/websocket/lib/base_websocket_client.dart @@ -3,7 +3,6 @@ import 'dart:collection'; import 'dart:convert'; import 'package:angel3_client/angel3_client.dart'; import 'package:angel3_client/base_angel_client.dart'; -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,9 +84,8 @@ abstract class BaseWebSocketClient extends BaseAngelClient { } } - BaseWebSocketClient(BaseClient client, baseUrl, - {this.reconnectOnClose = true, Duration? reconnectInterval}) - : super(client, baseUrl) { + BaseWebSocketClient(super.client, super.baseUrl, + {this.reconnectOnClose = true, Duration? reconnectInterval}) { _reconnectInterval = reconnectInterval ?? Duration(seconds: 10); } diff --git a/packages/websocket/lib/browser.dart b/packages/websocket/lib/browser.dart index d69a5129..cd280862 100644 --- a/packages/websocket/lib/browser.dart +++ b/packages/websocket/lib/browser.dart @@ -106,7 +106,6 @@ class WebSockets extends BaseWebSocketClient { class BrowserWebSocketsService extends WebSocketsService { final Type? type; - BrowserWebSocketsService(WebSocketChannel? socket, WebSockets app, String uri, - {this.type, AngelDeserializer? deserializer}) - : super(socket, app, uri, deserializer: deserializer); + BrowserWebSocketsService(super.socket, WebSockets super.app, super.uri, + {this.type, super.deserializer}); } diff --git a/packages/websocket/lib/io.dart b/packages/websocket/lib/io.dart index 1423c1fb..aba5fc4b 100644 --- a/packages/websocket/lib/io.dart +++ b/packages/websocket/lib/io.dart @@ -60,7 +60,5 @@ class WebSockets extends BaseWebSocketClient { class IoWebSocketsService extends WebSocketsService { final Type? type; - IoWebSocketsService( - WebSocketChannel? socket, WebSockets app, String uri, this.type) - : super(socket, app, uri); + IoWebSocketsService(super.socket, WebSockets super.app, super.uri, this.type); } diff --git a/packages/websocket/lib/websocket_context.dart b/packages/websocket/lib/websocket_context.dart index 1de2aff6..54a59e83 100644 --- a/packages/websocket/lib/websocket_context.dart +++ b/packages/websocket/lib/websocket_context.dart @@ -1,4 +1,4 @@ -part of angel3_websocket.server; +part of 'server.dart'; /// Represents a WebSocket session, with the original /// [RequestContext] and [ResponseContext] attached. diff --git a/packages/websocket/lib/websocket_controller.dart b/packages/websocket/lib/websocket_controller.dart index 7c683299..178641b8 100644 --- a/packages/websocket/lib/websocket_controller.dart +++ b/packages/websocket/lib/websocket_controller.dart @@ -1,4 +1,4 @@ -part of angel3_websocket.server; +part of 'server.dart'; /// Marks a method as available to WebSockets. class ExposeWs { diff --git a/packages/websocket/pubspec.yaml b/packages/websocket/pubspec.yaml index ecd7e991..ae352aaf 100644 --- a/packages/websocket/pubspec.yaml +++ b/packages/websocket/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_websocket -version: 8.0.0 +version: 8.1.0 description: This library provides WebSockets support for Angel3 framework. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/websocket @@ -10,11 +10,11 @@ dependencies: angel3_client: ^8.0.0 angel3_framework: ^8.0.0 angel3_http_exception: ^8.0.0 - belatuk_merge_map: ^5.0.0 + belatuk_merge_map: ^5.1.0 http: ^1.0.0 meta: ^1.8.0 stream_channel: ^2.1.0 - web_socket_channel: ^2.1.0 + web_socket_channel: '>=2.1.0 <2.4.1' collection: ^1.17.0 logging: ^1.1.0 dev_dependencies: @@ -22,7 +22,8 @@ dev_dependencies: angel3_model: ^8.0.0 quiver: ^3.2.0 test: ^1.24.0 - lints: ^2.1.0 + lints: ^3.0.0 + file: ^7.0.0 # dependency_overrides: # angel3_container: # path: ../container/angel_container diff --git a/packages/websocket/test/controller/common.dart b/packages/websocket/test/controller/common.dart index 13a441ff..febcf98a 100644 --- a/packages/websocket/test/controller/common.dart +++ b/packages/websocket/test/controller/common.dart @@ -29,7 +29,7 @@ const Game johnVsBob = Game(playerOne: 'John', playerTwo: 'Bob'); @Expose('/game') class GameController extends WebSocketController { - GameController(AngelWebSocket ws) : super(ws); + GameController(super.ws); @ExposeWs('search') dynamic search(WebSocketContext socket) async { diff --git a/packages/websocket/web/main.dart b/packages/websocket/web/main.dart index 8f1a9f17..8b44ac9b 100644 --- a/packages/websocket/web/main.dart +++ b/packages/websocket/web/main.dart @@ -6,6 +6,7 @@ void main() { var app = WebSockets(window.location.origin); window.alert(app.baseUrl.toString()); + // ignore: body_might_complete_normally_catch_error app.connect().catchError((_) { window.alert('no websocket'); });