From bfc94d94eb40fa85cf58aa7362c098b8b365459c Mon Sep 17 00:00:00 2001 From: "thomashii@dukefirehawk.com" Date: Fri, 18 Nov 2022 21:52:12 +0800 Subject: [PATCH] Fixed linter warnings --- packages/auth/CHANGELOG.md | 4 ++ .../auth/lib/src/middleware/require_auth.dart | 6 +-- packages/auth/pubspec.yaml | 2 +- packages/auth_oauth2/CHANGELOG.md | 4 ++ packages/auth_oauth2/example/main.dart | 5 +-- packages/auth_oauth2/pubspec.yaml | 2 +- packages/jael/jael_web/CHANGELOG.md | 38 +++++++++++++++++++ .../jael/jael_web/lib/src/builder/util.dart | 17 +-------- packages/jael/jael_web/pubspec.yaml | 5 ++- packages/orm/angel_orm_generator/CHANGELOG.md | 2 +- .../static/lib/src/virtual_directory.dart | 1 - packages/sync/example/main.dart | 1 - .../angel_user_agent/example/example.dart | 6 +-- packages/validate/CHANGELOG.md | 4 ++ packages/validate/lib/src/validator.dart | 6 +-- packages/validate/pubspec.yaml | 2 +- 16 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 packages/jael/jael_web/CHANGELOG.md diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md index dc3aabb1..1ad1bec3 100644 --- a/packages/auth/CHANGELOG.md +++ b/packages/auth/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 7.0.1 + +* Fixed linter warnings + ## 7.0.0 * Require Dart >= 2.17 diff --git a/packages/auth/lib/src/middleware/require_auth.dart b/packages/auth/lib/src/middleware/require_auth.dart index f65a1a4b..26fcd4e6 100644 --- a/packages/auth/lib/src/middleware/require_auth.dart +++ b/packages/auth/lib/src/middleware/require_auth.dart @@ -25,7 +25,7 @@ RequestHandler forceBasicAuth({String? realm}) { RequestHandler requireAuthentication() { return (RequestContext req, ResponseContext res, {bool throwError = true}) async { - bool _reject(ResponseContext res) { + bool reject(ResponseContext res) { if (throwError) { res.statusCode = 403; throw AngelHttpException.forbidden(); @@ -42,10 +42,10 @@ RequestHandler requireAuthentication() { await reqContainer.makeAsync(); return true; } else { - return _reject(res); + return reject(res); } } else { - return _reject(res); + return reject(res); } }; } diff --git a/packages/auth/pubspec.yaml b/packages/auth/pubspec.yaml index d91ecd50..605024a3 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: 7.0.0 +version: 7.0.1 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/auth environment: diff --git a/packages/auth_oauth2/CHANGELOG.md b/packages/auth_oauth2/CHANGELOG.md index ef294418..9f1cafdb 100644 --- a/packages/auth_oauth2/CHANGELOG.md +++ b/packages/auth_oauth2/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 7.0.1 + +* Updated example + ## 7.0.0 * Require Dart >= 2.17 diff --git a/packages/auth_oauth2/example/main.dart b/packages/auth_oauth2/example/main.dart index 8e6f5f4a..c2071e79 100644 --- a/packages/auth_oauth2/example/main.dart +++ b/packages/auth_oauth2/example/main.dart @@ -113,12 +113,9 @@ void main() async { } class User extends Model { - @override - String? id; - int? githubId; - User({this.id, this.githubId}); + User({super.id, this.githubId}); static User parse(Map map) => User(id: map['id'] as String?, githubId: map['github_id'] as int?); diff --git a/packages/auth_oauth2/pubspec.yaml b/packages/auth_oauth2/pubspec.yaml index 7ba2c8c6..99d05ed8 100644 --- a/packages/auth_oauth2/pubspec.yaml +++ b/packages/auth_oauth2/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_auth_oauth2 -version: 7.0.0 +version: 7.0.1 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 diff --git a/packages/jael/jael_web/CHANGELOG.md b/packages/jael/jael_web/CHANGELOG.md new file mode 100644 index 00000000..e91eafde --- /dev/null +++ b/packages/jael/jael_web/CHANGELOG.md @@ -0,0 +1,38 @@ +# Change Log + +## 7.0.1 + +* Upgraded dependencies +* Fixed deprecation + +## 7.0.0 + +* Require Dart >= 2.17 + +## 6.0.1 + +* Skipped release + +## 6.0.0 + +* Skipped release + +## 5.0.0 + +* Skipped release + +## 4.0.0 + +* Skipped release + +## 3.0.0 + +* Skipped release + +## 2.0.0 + +* Skipped release + +## 1.0.0 + +* Skipped release diff --git a/packages/jael/jael_web/lib/src/builder/util.dart b/packages/jael/jael_web/lib/src/builder/util.dart index 163feb01..31f2d66a 100644 --- a/packages/jael/jael_web/lib/src/builder/util.dart +++ b/packages/jael/jael_web/lib/src/builder/util.dart @@ -7,7 +7,7 @@ import 'package:analyzer/dart/element/type.dart'; import 'package:build/build.dart'; import 'package:code_builder/code_builder.dart'; import 'package:file/file.dart'; -import 'package:path/src/context.dart'; +import 'package:path/path.dart'; /// Converts a [DartType] to a [TypeReference]. TypeReference convertTypeReference(DartType? t) { @@ -21,7 +21,7 @@ TypeReference convertTypeReference(DartType? t) { } bool isRequiredParameter(ParameterElement e) { - return e.isNotOptional; + return e.isRequired; } bool isOptionalParameter(ParameterElement e) { @@ -233,19 +233,6 @@ class BuildSystemFile extends File { throw UnimplementedError(); } -/* - @override - Future> readAsBytes() { - var assetId = AssetId(package, path); - return reader.readAsBytes(assetId); - } - - @override - List readAsBytesSync() => throw _unsupported(); - @override - Future> readAsLines({Encoding encoding = utf8}) => - throw _unsupported(); -*/ @override List readAsLinesSync({Encoding encoding = utf8}) => throw _unsupported(); diff --git a/packages/jael/jael_web/pubspec.yaml b/packages/jael/jael_web/pubspec.yaml index 80b0a88c..2f29e0c6 100644 --- a/packages/jael/jael_web/pubspec.yaml +++ b/packages/jael/jael_web/pubspec.yaml @@ -1,13 +1,16 @@ name: jael3_web -version: 7.0.0 +version: 7.0.1 description: Experimental virtual DOM/SPA engine built on Jael3. Supports SSR. publish_to: none environment: sdk: '>=2.17.0 <3.0.0' dependencies: + analyzer: ^5.2.0 build: ^2.0.2 build_config: ^1.0.0 code_builder: ^4.0.0 + file: ^6.1.4 + path: ^1.8.2 jael3: ^7.0.0 jael3_preprocessor: ^7.0.0 source_gen: ^1.0.2 diff --git a/packages/orm/angel_orm_generator/CHANGELOG.md b/packages/orm/angel_orm_generator/CHANGELOG.md index f661f30b..dca6c15e 100644 --- a/packages/orm/angel_orm_generator/CHANGELOG.md +++ b/packages/orm/angel_orm_generator/CHANGELOG.md @@ -6,7 +6,7 @@ ## 7.0.1 -* Fixed issue #82: Fixed issue #82: Removed casting for numeric fields +* Fixed issue #82: Removed casting for numeric fields ## 7.0.0 diff --git a/packages/static/lib/src/virtual_directory.dart b/packages/static/lib/src/virtual_directory.dart index 1f96276c..e282ae01 100644 --- a/packages/static/lib/src/virtual_directory.dart +++ b/packages/static/lib/src/virtual_directory.dart @@ -226,7 +226,6 @@ class VirtualDirectory { type = '[Link]'; stub = p.basename(entity.path); } else { - //TODO: Handle unknown type _log.severe('Unknown file entity. Not a file, directory or link.'); type = '[]'; stub = ''; diff --git a/packages/sync/example/main.dart b/packages/sync/example/main.dart index f11908ff..341a8e0d 100644 --- a/packages/sync/example/main.dart +++ b/packages/sync/example/main.dart @@ -34,7 +34,6 @@ void main() { // propagate to app2. var ws = req.container!.make(); - // TODO: body retuns void //var body = await req.parseBody(); var body = {}; await ws.batchEvent(WebSocketEvent( diff --git a/packages/user_agent/angel_user_agent/example/example.dart b/packages/user_agent/angel_user_agent/example/example.dart index 786cd448..efadec2c 100644 --- a/packages/user_agent/angel_user_agent/example/example.dart +++ b/packages/user_agent/angel_user_agent/example/example.dart @@ -1,8 +1,8 @@ -import 'dart:io'; +//import 'dart:io'; import 'package:angel3_framework/angel3_framework.dart'; import 'package:angel3_framework/http.dart'; -import 'package:angel3_user_agent/angel3_user_agent.dart'; -import 'package:user_agent_analyzer/user_agent_analyzer.dart'; +//import 'package:angel3_user_agent/angel3_user_agent.dart'; +//import 'package:user_agent_analyzer/user_agent_analyzer.dart'; void main() async { var app = Angel(); diff --git a/packages/validate/CHANGELOG.md b/packages/validate/CHANGELOG.md index 738e1c56..c04e990f 100644 --- a/packages/validate/CHANGELOG.md +++ b/packages/validate/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 7.0.1 + +* Fixed linter warnings + ## 7.0.0 * Require Dart >= 2.17 diff --git a/packages/validate/lib/src/validator.dart b/packages/validate/lib/src/validator.dart index 9548c41f..e52ff0da 100644 --- a/packages/validate/lib/src/validator.dart +++ b/packages/validate/lib/src/validator.dart @@ -83,15 +83,15 @@ class Validator extends Matcher { schema[keys] is Iterable ? schema[keys] : [schema[keys]]; var iterable = []; - void _addTo(x) { + void addTo(x) { if (x is Iterable) { - x.forEach(_addTo); + x.forEach(addTo); } else { iterable.add(x); } } - tmpIterable.forEach(_addTo); + tmpIterable.forEach(addTo); for (var rule in iterable) { if (rule is Matcher) { diff --git a/packages/validate/pubspec.yaml b/packages/validate/pubspec.yaml index 7a780f8a..3ebe34b4 100644 --- a/packages/validate/pubspec.yaml +++ b/packages/validate/pubspec.yaml @@ -1,6 +1,6 @@ name: angel3_validate description: Cross-platform request body validation library based on `matcher`. -version: 7.0.0 +version: 7.0.1 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/validate environment: