diff --git a/melos.yaml b/melos.yaml index b15c4b80..05a27229 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,4 +1,4 @@ -name: angel3_platform +name: protevus_platform repository: https://github.com/protevus/platform packages: - core/** diff --git a/packages/auth/README.md b/packages/auth/README.md index 07cbf0ad..5cf286a1 100644 --- a/packages/auth/README.md +++ b/packages/auth/README.md @@ -1,6 +1,6 @@ # Protevus Anthentication -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_auth?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_auth?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/auth/LICENSE) @@ -52,7 +52,7 @@ configureServer(Protevus app) async { ## Default Authentication Callback -A frequent use case within SPA's is opening OAuth login endpoints in a separate window. [`angel3_client`](https://pub.dev/packages/angel3_client) provides a facility for this, which works perfectly with the default callback provided in this package. +A frequent use case within SPA's is opening OAuth login endpoints in a separate window. [`protevus_client`](https://pub.dev/packages/protevus_client) provides a facility for this, which works perfectly with the default callback provided in this package. ```dart configureServer(Protevus app) async { @@ -75,7 +75,7 @@ configureServer(Protevus app) async { } ``` -This renders a simple HTML page that fires the user's JWT as a `token` event in `window.opener`. `angel3_client` [exposes this as a Stream](https://pub.dev/documentation/angel3_client/latest/): +This renders a simple HTML page that fires the user's JWT as a `token` event in `window.opener`. `protevus_client` [exposes this as a Stream](https://pub.dev/documentation/protevus_client/latest/): ```dart app.authenticateViaPopup('/auth/google').listen((jwt) { diff --git a/packages/auth/example/example.dart b/packages/auth/example/example.dart index 93111ff3..8e3c63e1 100644 --- a/packages/auth/example/example.dart +++ b/packages/auth/example/example.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var app = Protevus(); diff --git a/packages/auth/example/example1.dart b/packages/auth/example/example1.dart index b13eb0fc..334b3a51 100644 --- a/packages/auth/example/example1.dart +++ b/packages/auth/example/example1.dart @@ -1,7 +1,7 @@ -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:collection/collection.dart' show IterableExtension; import 'package:io/ansi.dart'; import 'package:logging/logging.dart'; @@ -46,7 +46,7 @@ void main() async { return oldErrorHandler(e, req, res); }; - app.logger = Logger('angel3_auth') + app.logger = Logger('protevus_auth') ..level = Level.FINEST ..onRecord.listen((rec) { print(rec); diff --git a/packages/auth/example/example2.dart b/packages/auth/example/example2.dart index aecb12ec..e88d6894 100644 --- a/packages/auth/example/example2.dart +++ b/packages/auth/example/example2.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; final Map sampleUser = {'hello': 'world'}; diff --git a/packages/auth/lib/auth_token.dart b/packages/auth/lib/auth_token.dart index b1db07a0..29e049e0 100644 --- a/packages/auth/lib/auth_token.dart +++ b/packages/auth/lib/auth_token.dart @@ -1,4 +1,4 @@ /// Stand-alone JWT library. -library angel3_auth.auth_token; +library protevus_auth.auth_token; export 'src/auth_token.dart'; diff --git a/packages/auth/lib/angel3_auth.dart b/packages/auth/lib/protevus_auth.dart similarity index 91% rename from packages/auth/lib/angel3_auth.dart rename to packages/auth/lib/protevus_auth.dart index 95d4fc9a..605b13c9 100644 --- a/packages/auth/lib/angel3_auth.dart +++ b/packages/auth/lib/protevus_auth.dart @@ -1,4 +1,4 @@ -library angel3_auth; +library protevus_auth; export 'src/middleware/require_auth.dart'; export 'src/strategies/strategies.dart'; diff --git a/packages/auth/lib/src/auth_token.dart b/packages/auth/lib/src/auth_token.dart index e2090b4d..9265aad3 100644 --- a/packages/auth/lib/src/auth_token.dart +++ b/packages/auth/lib/src/auth_token.dart @@ -1,5 +1,5 @@ import 'dart:collection'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'dart:convert'; import 'package:crypto/crypto.dart'; import 'package:logging/logging.dart'; diff --git a/packages/auth/lib/src/middleware/require_auth.dart b/packages/auth/lib/src/middleware/require_auth.dart index 2ada1151..3fe41a59 100644 --- a/packages/auth/lib/src/middleware/require_auth.dart +++ b/packages/auth/lib/src/middleware/require_auth.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; /// Forces Basic authentication over the requested resource, with the given [realm] name, if no JWT is present. /// -/// [realm] defaults to `'angel3_auth'`. +/// [realm] defaults to `'protevus_auth'`. RequestHandler forceBasicAuth({String? realm}) { return (RequestContext req, ResponseContext res) async { if (req.container != null) { diff --git a/packages/auth/lib/src/options.dart b/packages/auth/lib/src/options.dart index 526aa1e2..87f50694 100644 --- a/packages/auth/lib/src/options.dart +++ b/packages/auth/lib/src/options.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'auth_token.dart'; typedef AngelAuthCallback = FutureOr Function( diff --git a/packages/auth/lib/src/plugin.dart b/packages/auth/lib/src/plugin.dart index 5714d5a0..38afe928 100644 --- a/packages/auth/lib/src/plugin.dart +++ b/packages/auth/lib/src/plugin.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:crypto/crypto.dart'; import 'package:logging/logging.dart'; diff --git a/packages/auth/lib/src/popup_page.dart b/packages/auth/lib/src/popup_page.dart index cb6b3007..bfed7c06 100644 --- a/packages/auth/lib/src/popup_page.dart +++ b/packages/auth/lib/src/popup_page.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:http_parser/http_parser.dart'; import 'options.dart'; diff --git a/packages/auth/lib/src/strategies/local.dart b/packages/auth/lib/src/strategies/local.dart index 40b2d699..c1f7a596 100644 --- a/packages/auth/lib/src/strategies/local.dart +++ b/packages/auth/lib/src/strategies/local.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; import 'package:logging/logging.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import '../options.dart'; import '../strategy.dart'; diff --git a/packages/auth/lib/src/strategy.dart b/packages/auth/lib/src/strategy.dart index 394189a0..d011fd33 100644 --- a/packages/auth/lib/src/strategy.dart +++ b/packages/auth/lib/src/strategy.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'options.dart'; /// A function that handles login and signup for an Protevus application. diff --git a/packages/auth/pubspec.yaml b/packages/auth/pubspec.yaml index 15c36154..302ee254 100644 --- a/packages/auth/pubspec.yaml +++ b/packages/auth/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_auth +name: protevus_auth description: A complete authentication plugin for Protevus. Includes support for stateless JWT tokens, Basic Auth, and more. version: 8.2.0 homepage: https://protevus-framework.web.app/ @@ -6,7 +6,7 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/auth environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 charcode: ^1.3.0 collection: ^1.17.0 crypto: ^3.0.0 @@ -15,21 +15,21 @@ dependencies: quiver: ^3.2.0 logging: ^1.2.0 dev_dependencies: - angel3_container: ^8.0.0 + protevus_container: ^8.0.0 http: ^1.0.0 io: ^1.0.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request \ No newline at end of file diff --git a/packages/auth/test/auth_token_test.dart b/packages/auth/test/auth_token_test.dart index 0aa414a0..51fc79df 100644 --- a/packages/auth/test/auth_token_test.dart +++ b/packages/auth/test/auth_token_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_auth/src/auth_token.dart'; +import 'package:protevus_auth/src/auth_token.dart'; import 'package:crypto/crypto.dart'; import 'package:test/test.dart'; diff --git a/packages/auth/test/callback_test.dart b/packages/auth/test/callback_test.dart index 27f3849d..f6dda007 100644 --- a/packages/auth/test/callback_test.dart +++ b/packages/auth/test/callback_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'dart:convert'; import 'package:collection/collection.dart' show IterableExtension; import 'package:http/http.dart' as http; @@ -55,7 +55,7 @@ void main() { return oldErrorHandler(e, req, res); }; - app.logger = Logger('angel3_auth') + app.logger = Logger('protevus_auth') ..level = Level.FINEST ..onRecord.listen((rec) { print(rec); diff --git a/packages/auth/test/config_test.dart b/packages/auth/test/config_test.dart index cc13d30f..c65181e1 100644 --- a/packages/auth/test/config_test.dart +++ b/packages/auth/test/config_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_auth/angel3_auth.dart'; +import 'package:protevus_auth/protevus_auth.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/auth/test/local_test.dart b/packages/auth/test/local_test.dart index 6a9f8464..4604091d 100644 --- a/packages/auth/test/local_test.dart +++ b/packages/auth/test/local_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; diff --git a/packages/auth/test/protect_cookie_test.dart b/packages/auth/test/protect_cookie_test.dart index ddd750f1..49c08b18 100644 --- a/packages/auth/test/protect_cookie_test.dart +++ b/packages/auth/test/protect_cookie_test.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:angel3_auth/angel3_auth.dart'; +import 'package:protevus_auth/protevus_auth.dart'; import 'package:test/test.dart'; const Duration threeDays = Duration(days: 3); diff --git a/packages/auth_oauth2/README.md b/packages/auth_oauth2/README.md index 7e5f8491..151e9623 100644 --- a/packages/auth_oauth2/README.md +++ b/packages/auth_oauth2/README.md @@ -1,6 +1,6 @@ # Protevus OAuth2 Handler -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_auth_oauth2?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_auth_oauth2?include_prereleases) ![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)() [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/auth_oauth2/LICENSE) @@ -76,7 +76,7 @@ Lastly, connect it to an `AngelAuth` instance, and wire it up to an `Protevus` s 1. Redirect users to the external provider 2. Acts as a callback and handles an access code -In the case of the callback route, you may want to display an HTML page that closes a popup window. In this case, use `confirmPopupAuthentication`, which is bundled with `package:angel3_auth`, as a `callback` function: +In the case of the callback route, you may want to display an HTML page that closes a popup window. In this case, use `confirmPopupAuthentication`, which is bundled with `package:protevus_auth`, as a `callback` function: ```dart configureServer(Protevus app) async { diff --git a/packages/auth_oauth2/example/main.dart b/packages/auth_oauth2/example/main.dart index 5dd2372f..75a999ee 100644 --- a/packages/auth_oauth2/example/main.dart +++ b/packages/auth_oauth2/example/main.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_auth_oauth2/angel3_auth_oauth2.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_auth_oauth2/protevus_auth_oauth2.dart'; import 'package:http_parser/http_parser.dart'; import 'package:logging/logging.dart'; diff --git a/packages/auth_oauth2/lib/angel3_auth_oauth2.dart b/packages/auth_oauth2/lib/protevus_auth_oauth2.dart similarity index 95% rename from packages/auth_oauth2/lib/angel3_auth_oauth2.dart rename to packages/auth_oauth2/lib/protevus_auth_oauth2.dart index 9373ef2d..16f3b879 100644 --- a/packages/auth_oauth2/lib/angel3_auth_oauth2.dart +++ b/packages/auth_oauth2/lib/protevus_auth_oauth2.dart @@ -1,8 +1,8 @@ -library angel3_auth_oauth2; +library protevus_auth_oauth2; import 'dart:async'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:http_parser/http_parser.dart'; import 'package:oauth2/oauth2.dart' as oauth2; diff --git a/packages/auth_oauth2/pubspec.yaml b/packages/auth_oauth2/pubspec.yaml index 2e3e6e76..217543bf 100644 --- a/packages/auth_oauth2/pubspec.yaml +++ b/packages/auth_oauth2/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_auth_oauth2 +name: protevus_auth_oauth2 version: 8.2.0 description: Protevus library for authenticating users with external identity providers via OAuth2. homepage: https://protevus-framework.web.app/ @@ -6,25 +6,25 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/auth_o environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_auth: ^8.0.0 - angel3_framework: ^8.0.0 + protevus_auth: ^8.0.0 + protevus_framework: ^8.0.0 http_parser: ^4.0.0 oauth2: ^2.0.0 dev_dependencies: logging: ^1.2.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth diff --git a/packages/auth_twitter/README.md b/packages/auth_twitter/README.md index bf9a3707..2b0bc845 100644 --- a/packages/auth_twitter/README.md +++ b/packages/auth_twitter/README.md @@ -1,6 +1,6 @@ # Protevus Twitter OAuth1 -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_auth_twitter?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_auth_twitter?include_prereleases) ![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)]() [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/auth_twitter/LICENSE) diff --git a/packages/auth_twitter/example/example.dart b/packages/auth_twitter/example/example.dart index cc62fcf2..271da4a1 100644 --- a/packages/auth_twitter/example/example.dart +++ b/packages/auth_twitter/example/example.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_auth_twitter/angel3_auth_twitter.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_auth_twitter/protevus_auth_twitter.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; class _User { diff --git a/packages/auth_twitter/lib/angel3_auth_twitter.dart b/packages/auth_twitter/lib/protevus_auth_twitter.dart similarity index 98% rename from packages/auth_twitter/lib/angel3_auth_twitter.dart rename to packages/auth_twitter/lib/protevus_auth_twitter.dart index c40ca9d9..aa01bcff 100644 --- a/packages/auth_twitter/lib/angel3_auth_twitter.dart +++ b/packages/auth_twitter/lib/protevus_auth_twitter.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:http/http.dart' as http; import 'package:path/path.dart' as p; //import 'package:oauth1/oauth1.dart' as oauth; diff --git a/packages/auth_twitter/pubspec.yaml b/packages/auth_twitter/pubspec.yaml index c0f7763f..546e4202 100644 --- a/packages/auth_twitter/pubspec.yaml +++ b/packages/auth_twitter/pubspec.yaml @@ -1,4 +1,4 @@ -name: "angel3_auth_twitter" +name: "protevus_auth_twitter" description: Protevus authentication strategy for Twitter login. Auto-signs requests. version: 8.0.0 homepage: https://protevus-framework.web.app/ @@ -7,8 +7,8 @@ publish_to: none environment: sdk: ">=3.3.0 <4.0.0" dependencies: - angel3_auth: ^8.0.0 - angel3_framework: ^8.0.0 + protevus_auth: ^8.0.0 + protevus_framework: ^8.0.0 http: ^1.0.0 path: ^1.9.0 belatuk_oauth1: ^3.0.0 @@ -18,17 +18,17 @@ dev_dependencies: lints: ^4.0.0 dependency_overrides: http: ^1.0.0 -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth \ No newline at end of file diff --git a/packages/cache/README.md b/packages/cache/README.md index 69d1782d..3bdefa6d 100644 --- a/packages/cache/README.md +++ b/packages/cache/README.md @@ -1,6 +1,6 @@ # Protevus HTTP Cache -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_cache?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_cache?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/cache/LICENSE) diff --git a/packages/cache/example/cache_service.dart b/packages/cache/example/cache_service.dart index 00b501db..b07e599b 100644 --- a/packages/cache/example/cache_service.dart +++ b/packages/cache/example/cache_service.dart @@ -1,6 +1,6 @@ -import 'package:angel3_cache/angel3_cache.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_cache/protevus_cache.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var app = Protevus(); diff --git a/packages/cache/example/main.dart b/packages/cache/example/main.dart index b8447fa1..433a855a 100644 --- a/packages/cache/example/main.dart +++ b/packages/cache/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_cache/angel3_cache.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_cache/protevus_cache.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var app = Protevus(); diff --git a/packages/cache/lib/angel3_cache.dart b/packages/cache/lib/protevus_cache.dart similarity index 100% rename from packages/cache/lib/angel3_cache.dart rename to packages/cache/lib/protevus_cache.dart diff --git a/packages/cache/lib/src/cache.dart b/packages/cache/lib/src/cache.dart index 5bb85223..d6c4925c 100644 --- a/packages/cache/lib/src/cache.dart +++ b/packages/cache/lib/src/cache.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:io' show HttpDate; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:pool/pool.dart'; import 'package:logging/logging.dart'; diff --git a/packages/cache/lib/src/cache_service.dart b/packages/cache/lib/src/cache_service.dart index 0a3cfeea..7e739889 100644 --- a/packages/cache/lib/src/cache_service.dart +++ b/packages/cache/lib/src/cache_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'package:collection/collection.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; /// An Protevus [Service] that caches data from another service. /// diff --git a/packages/cache/lib/src/serializer.dart b/packages/cache/lib/src/serializer.dart index d127c264..7b7e702d 100644 --- a/packages/cache/lib/src/serializer.dart +++ b/packages/cache/lib/src/serializer.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; /// A middleware that enables the caching of response serialization. /// diff --git a/packages/cache/pubspec.yaml b/packages/cache/pubspec.yaml index e334b569..e8dba0a1 100644 --- a/packages/cache/pubspec.yaml +++ b/packages/cache/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_cache +name: protevus_cache version: 8.2.0 description: A service that provides HTTP caching to the response data for Protevus homepage: https://protevus-framework.web.app/ @@ -6,37 +6,37 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/cache environment: sdk: '>=3.4.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 collection: ^1.17.0 meta: ^1.9.0 pool: ^1.5.0 logging: ^1.2.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 glob: ^2.0.1 http: ^1.0.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_test: +# protevus_test: # path: ../test -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/cache/test/cache_test.dart b/packages/cache/test/cache_test.dart index 9089de69..8e6e958f 100644 --- a/packages/cache/test/cache_test.dart +++ b/packages/cache/test/cache_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_cache/angel3_cache.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_cache/protevus_cache.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:http/http.dart' as http; //import 'package:glob/glob.dart'; import 'package:test/test.dart'; diff --git a/packages/client/README.md b/packages/client/README.md index bc2794e2..bdfab3b9 100644 --- a/packages/client/README.md +++ b/packages/client/README.md @@ -1,6 +1,6 @@ # Protevus Client -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_client?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_client?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/client/LICENSE) @@ -11,9 +11,9 @@ A browser, mobile and command line based client that supports querying Protevus ```dart // Choose one or the other, depending on platform -import 'package:angel3_client/io.dart'; -import 'package:angel3_client/browser.dart'; -import 'package:angel3_client/flutter.dart'; +import 'package:protevus_client/io.dart'; +import 'package:protevus_client/browser.dart'; +import 'package:protevus_client/flutter.dart'; main() async { Protevus app = Rest("http://localhost:3000"); diff --git a/packages/client/example/client/example_client.dart b/packages/client/example/client/example_client.dart index a6615044..bdb9c701 100644 --- a/packages/client/example/client/example_client.dart +++ b/packages/client/example/client/example_client.dart @@ -1,4 +1,4 @@ -import 'package:angel3_client/io.dart' as c; +import 'package:protevus_client/io.dart' as c; void main() async { c.Protevus client = c.Rest('http://localhost:3000'); diff --git a/packages/client/example/example1.dart b/packages/client/example/example1.dart index 2e49cb5b..954423e3 100644 --- a/packages/client/example/example1.dart +++ b/packages/client/example/example1.dart @@ -1,6 +1,6 @@ -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; void main() async { diff --git a/packages/client/example/main.dart b/packages/client/example/main.dart index dd868123..cfc00c0b 100644 --- a/packages/client/example/main.dart +++ b/packages/client/example/main.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_client/angel3_client.dart'; +import 'package:protevus_client/protevus_client.dart'; Future doSomething(Protevus app) async { var userService = app diff --git a/packages/client/lib/base_angel_client.dart b/packages/client/lib/base_protevus_client.dart similarity index 99% rename from packages/client/lib/base_angel_client.dart rename to packages/client/lib/base_protevus_client.dart index 00934309..100da4ff 100644 --- a/packages/client/lib/base_angel_client.dart +++ b/packages/client/lib/base_protevus_client.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:http/http.dart'; import 'package:path/path.dart'; import 'package:logging/logging.dart'; -import 'angel3_client.dart'; +import 'protevus_client.dart'; const Map _readHeaders = {'Accept': 'application/json'}; const Map _writeHeaders = { diff --git a/packages/client/lib/browser.dart b/packages/client/lib/browser.dart index 78449f26..24470c37 100644 --- a/packages/client/lib/browser.dart +++ b/packages/client/lib/browser.dart @@ -6,10 +6,10 @@ import 'dart:async' import 'dart:html' show CustomEvent, Event, window; import 'dart:convert'; import 'package:http/browser_client.dart' as http; -import 'angel3_client.dart'; +import 'protevus_client.dart'; // import 'auth_types.dart' as auth_types; -import 'base_angel_client.dart'; -export 'angel3_client.dart'; +import 'base_protevus_client.dart'; +export 'protevus_client.dart'; /// Queries an Protevus server via REST. class Rest extends BaseProtevusClient { diff --git a/packages/client/lib/flutter.dart b/packages/client/lib/flutter.dart index e31384e7..e68e8dcc 100644 --- a/packages/client/lib/flutter.dart +++ b/packages/client/lib/flutter.dart @@ -3,8 +3,8 @@ library angel_client.flutter; import 'dart:async'; import 'package:http/http.dart' as http; -import 'base_angel_client.dart'; -export 'angel3_client.dart'; +import 'base_protevus_client.dart'; +export 'protevus_client.dart'; /// Queries an Protevus server via REST. class Rest extends BaseProtevusClient { diff --git a/packages/client/lib/io.dart b/packages/client/lib/io.dart index 3ca36f12..05231f33 100644 --- a/packages/client/lib/io.dart +++ b/packages/client/lib/io.dart @@ -6,9 +6,9 @@ import 'package:http/http.dart' as http; import 'package:belatuk_json_serializer/belatuk_json_serializer.dart' as god; import 'package:path/path.dart' as p; import 'package:logging/logging.dart'; -import 'angel3_client.dart'; -import 'base_angel_client.dart'; -export 'angel3_client.dart'; +import 'protevus_client.dart'; +import 'base_protevus_client.dart'; +export 'protevus_client.dart'; /// Queries an Protevus server via REST. class Rest extends BaseProtevusClient { diff --git a/packages/client/lib/angel3_client.dart b/packages/client/lib/protevus_client.dart similarity index 99% rename from packages/client/lib/angel3_client.dart rename to packages/client/lib/protevus_client.dart index 1c5e358b..28acc355 100644 --- a/packages/client/lib/angel3_client.dart +++ b/packages/client/lib/protevus_client.dart @@ -1,12 +1,12 @@ /// Client library for the Protevus framework. -library angel3_client; +library protevus_client; import 'dart:async'; import 'package:collection/collection.dart'; import 'dart:convert'; import 'package:http/http.dart' as http; //import 'package:logging/logging.dart'; -export 'package:angel3_http_exception/angel3_http_exception.dart'; +export 'package:protevus_http_exception/protevus_http_exception.dart'; /// A function that configures an [Protevus] client in some way. typedef ProtevusConfigurer = FutureOr Function(Protevus app); diff --git a/packages/client/pubspec.yaml b/packages/client/pubspec.yaml index 96e2067a..cc66da0c 100644 --- a/packages/client/pubspec.yaml +++ b/packages/client/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_client +name: protevus_client version: 8.2.0 description: A browser, mobile and command line based client that supports querying Protevus servers homepage: https://protevus-framework.web.app/ @@ -6,7 +6,7 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/client environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_http_exception: ^8.0.0 + protevus_http_exception: ^8.0.0 belatuk_json_serializer: ^7.0.0 collection: ^1.17.0 http: ^1.0.0 @@ -14,11 +14,11 @@ dependencies: path: ^1.8.0 logging: ^1.1.0 dev_dependencies: - angel3_framework: ^8.0.0 - angel3_model: ^8.0.0 - angel3_mock_request: ^8.0.0 - angel3_container: ^8.0.0 - angel3_auth: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_model: ^8.0.0 + protevus_mock_request: ^8.0.0 + protevus_container: ^8.0.0 + protevus_auth: ^8.0.0 async: ^2.11.0 quiver: ^3.2.0 build_runner: ^2.4.0 @@ -26,17 +26,17 @@ dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth \ No newline at end of file diff --git a/packages/client/test/auth_test.dart b/packages/client/test/auth_test.dart index 7f75f0d0..6f984def 100644 --- a/packages/client/test/auth_test.dart +++ b/packages/client/test/auth_test.dart @@ -1,7 +1,7 @@ -import 'package:angel3_auth/angel3_auth.dart'; -import 'package:angel3_client/io.dart' as c; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_auth/protevus_auth.dart'; +import 'package:protevus_client/io.dart' as c; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; diff --git a/packages/client/test/common.dart b/packages/client/test/common.dart index 91275614..7fe2b7a1 100644 --- a/packages/client/test/common.dart +++ b/packages/client/test/common.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_client/base_angel_client.dart'; +import 'package:protevus_client/base_protevus_client.dart'; import 'dart:convert'; import 'package:http/src/base_client.dart' as http; import 'package:http/src/base_request.dart' as http; diff --git a/packages/client/test/list_test.dart b/packages/client/test/list_test.dart index 8a7def2a..a0d8edf5 100644 --- a/packages/client/test/list_test.dart +++ b/packages/client/test/list_test.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'package:async/async.dart'; import 'dart:io'; -import 'package:angel3_client/io.dart' as c; -import 'package:angel3_framework/angel3_framework.dart' as s; -import 'package:angel3_framework/http.dart' as s; -import 'package:angel3_container/mirrors.dart'; +import 'package:protevus_client/io.dart' as c; +import 'package:protevus_framework/protevus_framework.dart' as s; +import 'package:protevus_framework/http.dart' as s; +import 'package:protevus_container/mirrors.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/client/test/shared.dart b/packages/client/test/shared.dart index 57e44d62..248638db 100644 --- a/packages/client/test/shared.dart +++ b/packages/client/test/shared.dart @@ -1,4 +1,4 @@ -import 'package:angel3_model/angel3_model.dart'; +import 'package:protevus_model/protevus_model.dart'; import 'package:quiver/core.dart'; class Postcard extends Model { diff --git a/packages/client/web/main.dart b/packages/client/web/main.dart index da1cc68f..8718f872 100644 --- a/packages/client/web/main.dart +++ b/packages/client/web/main.dart @@ -1,5 +1,5 @@ import 'dart:html'; -import 'package:angel3_client/browser.dart'; +import 'package:protevus_client/browser.dart'; /// Dummy app to ensure client works with DDC. void main() { diff --git a/packages/configuration/README.md b/packages/configuration/README.md index 8a5eb701..ec33ae5a 100644 --- a/packages/configuration/README.md +++ b/packages/configuration/README.md @@ -1,6 +1,6 @@ # Protevus Configuration Loader -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_configuration?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_configuration?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/configuration/LICENSE) @@ -21,7 +21,7 @@ In `pubspec.yaml`: ```yaml dependencies: - angel3_configuration: ^6.0.0 + protevus_configuration: ^6.0.0 ``` ## Usage @@ -63,7 +63,7 @@ Call `configuration()`. The loaded configuration will be available in your appli The former will allow you to search in a directory other than `config`, and the latter lets you override `$ANGEL_ENV` by specifying a specific configuration name to look for (i.e. `production`). -This package uses [`package:angel3_merge_map`](https://pub.dev/packages/angel3_merge_map) +This package uses [`package:protevus_merge_map`](https://pub.dev/packages/protevus_merge_map) internally, so existing configurations can be deeply merged. Example: diff --git a/packages/configuration/example/main.dart b/packages/configuration/example/main.dart index 1d0ec821..1383d74a 100644 --- a/packages/configuration/example/main.dart +++ b/packages/configuration/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_configuration/angel3_configuration.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_configuration/protevus_configuration.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/local.dart'; Future main() async { diff --git a/packages/configuration/lib/angel3_configuration.dart b/packages/configuration/lib/protevus_configuration.dart similarity index 97% rename from packages/configuration/lib/angel3_configuration.dart rename to packages/configuration/lib/protevus_configuration.dart index c6439971..205e3457 100644 --- a/packages/configuration/lib/angel3_configuration.dart +++ b/packages/configuration/lib/protevus_configuration.dart @@ -1,8 +1,8 @@ -library angel3_configuration; +library protevus_configuration; import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:dotenv/dotenv.dart'; import 'package:file/file.dart'; import 'package:belatuk_merge_map/belatuk_merge_map.dart'; diff --git a/packages/configuration/pubspec.yaml b/packages/configuration/pubspec.yaml index 27c84145..a8236d1b 100644 --- a/packages/configuration/pubspec.yaml +++ b/packages/configuration/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_configuration +name: protevus_configuration version: 8.2.0 description: Automatic YAML application configuration loader for Protevus 3, with .env support. homepage: https://protevus-framework.web.app/ @@ -6,7 +6,7 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/config environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 belatuk_merge_map: ^5.0.0 dotenv: ^4.1.0 file: ^7.0.0 @@ -18,15 +18,15 @@ dev_dependencies: belatuk_pretty_logging: ^6.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request \ No newline at end of file diff --git a/packages/configuration/test/all_test.dart b/packages/configuration/test/all_test.dart index 4e6110a6..a3811cc3 100644 --- a/packages/configuration/test/all_test.dart +++ b/packages/configuration/test/all_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_configuration/angel3_configuration.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_configuration/protevus_configuration.dart'; import 'package:belatuk_pretty_logging/belatuk_pretty_logging.dart'; import 'package:file/local.dart'; import 'package:io/ansi.dart'; diff --git a/packages/core/container/container/README.md b/packages/core/container/container/README.md index e531453a..fcf9c7f6 100644 --- a/packages/core/container/container/README.md +++ b/packages/core/container/container/README.md @@ -1,6 +1,6 @@ # Protevus Container -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_container?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_container?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/container/angel_container/LICENSE) @@ -8,9 +8,9 @@ A better IoC container for Protevus, ultimately allowing Protevus to be used with or without `dart:mirrors` package. ```dart - import 'package:angel3_container/mirrors.dart'; - import 'package:angel3_framework/angel3_framework.dart'; - import 'package:angel3_framework/http.dart'; + import 'package:protevus_container/mirrors.dart'; + import 'package:protevus_framework/protevus_framework.dart'; + import 'package:protevus_framework/http.dart'; @Expose('/sales', middleware: [process1]) class SalesController extends Controller { diff --git a/packages/core/container/container/example/main.dart b/packages/core/container/container/example/main.dart index abc4e97c..1fcd6e79 100644 --- a/packages/core/container/container/example/main.dart +++ b/packages/core/container/container/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_container/mirrors.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_container/mirrors.dart'; Future main() async { // Create a container instance. diff --git a/packages/core/container/container/example/throwing.dart b/packages/core/container/container/example/throwing.dart index 836bc78c..557dc5c0 100644 --- a/packages/core/container/container/example/throwing.dart +++ b/packages/core/container/container/example/throwing.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; void main() { var reflector = const ThrowingReflector(); diff --git a/packages/core/container/container/lib/angel3_container.dart b/packages/core/container/container/lib/protevus_container.dart similarity index 88% rename from packages/core/container/container/lib/angel3_container.dart rename to packages/core/container/container/lib/protevus_container.dart index e50508e8..845e5828 100644 --- a/packages/core/container/container/lib/angel3_container.dart +++ b/packages/core/container/container/lib/protevus_container.dart @@ -1,4 +1,4 @@ -library angel3_container; +library protevus_container; export 'src/container.dart'; export 'src/empty/empty.dart'; diff --git a/packages/core/container/container/lib/src/empty/empty.dart b/packages/core/container/container/lib/src/empty/empty.dart index b6a29c35..0aa11f57 100644 --- a/packages/core/container/container/lib/src/empty/empty.dart +++ b/packages/core/container/container/lib/src/empty/empty.dart @@ -1,4 +1,4 @@ -import '../../angel3_container.dart'; +import '../../protevus_container.dart'; final Map _symbolNames = {}; diff --git a/packages/core/container/container/lib/src/throwing.dart b/packages/core/container/container/lib/src/throwing.dart index 0bb71368..fa548ba4 100644 --- a/packages/core/container/container/lib/src/throwing.dart +++ b/packages/core/container/container/lib/src/throwing.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/src/container_const.dart'; +import 'package:protevus_container/src/container_const.dart'; import 'empty/empty.dart'; import 'reflector.dart'; diff --git a/packages/core/container/container/pubspec.yaml b/packages/core/container/container/pubspec.yaml index 3d8381fb..e63003e1 100644 --- a/packages/core/container/container/pubspec.yaml +++ b/packages/core/container/container/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_container +name: protevus_container version: 8.2.0 description: Protevus hierarchical DI container, and pluggable backends for reflection. homepage: https://protevus-framework.web.app/ diff --git a/packages/core/container/container/test/common.dart b/packages/core/container/container/test/common.dart index 9fa9f114..255bebf0 100644 --- a/packages/core/container/container/test/common.dart +++ b/packages/core/container/container/test/common.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:test/test.dart'; void returnVoidFromAFunction(int x) {} diff --git a/packages/core/container/container/test/empty_reflector_test.dart b/packages/core/container/container/test/empty_reflector_test.dart index 6ada3d63..a2fa3e61 100644 --- a/packages/core/container/container/test/empty_reflector_test.dart +++ b/packages/core/container/container/test/empty_reflector_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/container/container/test/has_test.dart b/packages/core/container/container/test/has_test.dart index c677a045..5c1c914e 100644 --- a/packages/core/container/container/test/has_test.dart +++ b/packages/core/container/container/test/has_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/container/container/test/lazy_test.dart b/packages/core/container/container/test/lazy_test.dart index 56631343..a533025e 100644 --- a/packages/core/container/container/test/lazy_test.dart +++ b/packages/core/container/container/test/lazy_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/container/container/test/mirrors_test.dart b/packages/core/container/container/test/mirrors_test.dart index 86a5fd8e..5d5c5edb 100644 --- a/packages/core/container/container/test/mirrors_test.dart +++ b/packages/core/container/container/test/mirrors_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_container/mirrors.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_container/mirrors.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/core/container/container/test/named_test.dart b/packages/core/container/container/test/named_test.dart index e7626e86..7dac8bde 100644 --- a/packages/core/container/container/test/named_test.dart +++ b/packages/core/container/container/test/named_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/container/container/test/throwing_reflector_test.dart b/packages/core/container/container/test/throwing_reflector_test.dart index e41e0814..a64912f6 100644 --- a/packages/core/container/container/test/throwing_reflector_test.dart +++ b/packages/core/container/container/test/throwing_reflector_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/container/container_generator/CHANGELOG.md b/packages/core/container/container_generator/CHANGELOG.md index 5cd1010d..86edf8ba 100644 --- a/packages/core/container/container_generator/CHANGELOG.md +++ b/packages/core/container/container_generator/CHANGELOG.md @@ -41,7 +41,7 @@ ## 3.0.1 -* Updated `package:angel3_container` +* Updated `package:protevus_container` ## 3.0.0 @@ -52,7 +52,7 @@ * Migrated to support Dart >= 2.12 NNBD * Updated linter to `package:lints` -* Updated to use `angel3_` packages +* Updated to use `protevus_` packages ## 2.0.0 diff --git a/packages/core/container/container_generator/README.md b/packages/core/container/container_generator/README.md index 805622fb..199451d6 100644 --- a/packages/core/container/container_generator/README.md +++ b/packages/core/container/container_generator/README.md @@ -1,9 +1,9 @@ # Protevus Container Generator -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_container_generator?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_container_generator?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) -[![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/container/angel3_container_generator/LICENSE) +[![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/container/protevus_container_generator/LICENSE) An alternative container for Protevus that uses `reflectable` package instead of `dart:mirrors` for reflection. However, `reflectable` has more limited relfection capabilities when compared to `dart:mirrors`. diff --git a/packages/core/container/container_generator/example/main.dart b/packages/core/container/container_generator/example/main.dart index ed206f79..1c3c2c5a 100644 --- a/packages/core/container/container_generator/example/main.dart +++ b/packages/core/container/container_generator/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_container_generator/angel3_container_generator.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_container_generator/protevus_container_generator.dart'; Future main() async { // Create a container instance. diff --git a/packages/core/container/container_generator/example/main.reflectable.dart b/packages/core/container/container_generator/example/main.reflectable.dart index b274955a..100d0ffc 100644 --- a/packages/core/container/container_generator/example/main.reflectable.dart +++ b/packages/core/container/container_generator/example/main.reflectable.dart @@ -3,7 +3,7 @@ import 'dart:core'; import 'dart:math' as prefix6; -import 'package:angel3_container_generator/angel3_container_generator.dart' +import 'package:protevus_container_generator/protevus_container_generator.dart' as prefix0; import 'package:reflectable/capability.dart' as prefix5; import 'package:reflectable/mirrors.dart' as prefix4; @@ -6365,7 +6365,7 @@ final _data = { r.LibraryMirrorImpl( r'', Uri.parse( - 'package:angel3_container_generator/angel3_container_generator.dart'), + 'package:protevus_container_generator/protevus_container_generator.dart'), const prefix0.ContainedReflectable(), const [0], {r'contained': () => prefix0.contained}, diff --git a/packages/core/container/container_generator/lib/angel3_container_generator.dart b/packages/core/container/container_generator/lib/protevus_container_generator.dart similarity index 99% rename from packages/core/container/container_generator/lib/angel3_container_generator.dart rename to packages/core/container/container_generator/lib/protevus_container_generator.dart index 2aed467d..e95f5b8b 100644 --- a/packages/core/container/container_generator/lib/angel3_container_generator.dart +++ b/packages/core/container/container_generator/lib/protevus_container_generator.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:reflectable/reflectable.dart'; /// A [Reflectable] instance that can be used as an annotation on types to generate metadata for them. diff --git a/packages/core/container/container_generator/pubspec.yaml b/packages/core/container/container_generator/pubspec.yaml index 7baa4256..67ccf407 100644 --- a/packages/core/container/container_generator/pubspec.yaml +++ b/packages/core/container/container_generator/pubspec.yaml @@ -1,12 +1,12 @@ -name: angel3_container_generator +name: protevus_container_generator version: 8.2.0 -description: Codegen support for using pkg:reflectable with pkg:angel3_container. +description: Codegen support for using pkg:reflectable with pkg:protevus_container. homepage: https://protevus-framework.web.app/ repository: https://github.com/dart-backend/protevus/tree/master/packages/container/angel_container_generator environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_container: ^8.0.0 + protevus_container: ^8.0.0 reflectable: ^4.0.0 dev_dependencies: build_runner: ^2.4.0 @@ -14,5 +14,5 @@ dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../angel_container diff --git a/packages/core/container/container_generator/test/reflector_test.dart b/packages/core/container/container_generator/test/reflector_test.dart index 4db6965e..556c7db1 100644 --- a/packages/core/container/container_generator/test/reflector_test.dart +++ b/packages/core/container/container_generator/test/reflector_test.dart @@ -1,5 +1,5 @@ -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_container_generator/angel3_container_generator.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_container_generator/protevus_container_generator.dart'; import 'package:test/test.dart'; import 'reflector_test.reflectable.dart'; diff --git a/packages/core/container/container_generator/test/reflector_test.reflectable.dart b/packages/core/container/container_generator/test/reflector_test.reflectable.dart index 73aae70f..5e1af9b0 100644 --- a/packages/core/container/container_generator/test/reflector_test.reflectable.dart +++ b/packages/core/container/container_generator/test/reflector_test.reflectable.dart @@ -3,8 +3,8 @@ import 'dart:core'; import 'dart:math' as prefix8; -import 'package:angel3_container/src/reflector.dart' as prefix7; -import 'package:angel3_container_generator/angel3_container_generator.dart' +import 'package:protevus_container/src/reflector.dart' as prefix7; +import 'package:protevus_container_generator/protevus_container_generator.dart' as prefix0; import 'package:reflectable/capability.dart' as prefix6; import 'package:reflectable/mirrors.dart' as prefix5; @@ -7248,7 +7248,7 @@ final _data = { r.LibraryMirrorImpl( r'', Uri.parse( - 'asset:angel3_container_generator/test/reflector_test.dart'), + 'asset:protevus_container_generator/test/reflector_test.dart'), const prefix0.ContainedReflectable(), const [43, 44, 45], { @@ -7262,7 +7262,7 @@ final _data = { r.LibraryMirrorImpl( r'', Uri.parse( - 'package:angel3_container_generator/angel3_container_generator.dart'), + 'package:protevus_container_generator/protevus_container_generator.dart'), const prefix0.ContainedReflectable(), const [0], {r'contained': () => prefix0.contained}, diff --git a/packages/core/contracts/pubspec.yaml b/packages/core/contracts/pubspec.yaml index cd5f78d7..d5e5906e 100644 --- a/packages/core/contracts/pubspec.yaml +++ b/packages/core/contracts/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_contracts +name: protevus_contracts description: This package defines contracts for Protevus Platform version: 0.0.1 homepage: https://protevus.com @@ -10,7 +10,7 @@ environment: # Add regular dependencies here. dependencies: - # path: ^1.8.0 + path: ^1.8.0 dev_dependencies: lints: ^3.0.0 diff --git a/packages/core/exceptions/README.md b/packages/core/exceptions/README.md index 1dff85ac..94b0606c 100644 --- a/packages/core/exceptions/README.md +++ b/packages/core/exceptions/README.md @@ -1,6 +1,6 @@ # Protevus Http Exception -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_http_exception?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_http_exception?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/http_exception/LICENSE) diff --git a/packages/core/exceptions/example/main.dart b/packages/core/exceptions/example/main.dart index 0e190d5c..8d9ecc08 100644 --- a/packages/core/exceptions/example/main.dart +++ b/packages/core/exceptions/example/main.dart @@ -1,4 +1,4 @@ -import 'package:angel3_http_exception/angel3_http_exception.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; void main() => throw ProtevusHttpException.notFound(message: "Can't find that page!"); diff --git a/packages/core/exceptions/lib/angel3_http_exception.dart b/packages/core/exceptions/lib/protevus_http_exception.dart similarity index 99% rename from packages/core/exceptions/lib/angel3_http_exception.dart rename to packages/core/exceptions/lib/protevus_http_exception.dart index 3a5f3ecc..83bd8d50 100644 --- a/packages/core/exceptions/lib/angel3_http_exception.dart +++ b/packages/core/exceptions/lib/protevus_http_exception.dart @@ -1,4 +1,4 @@ -library angel3_http_exception; +library protevus_http_exception; //import 'package:dart2_constant/convert.dart'; import 'dart:convert'; diff --git a/packages/core/exceptions/pubspec.yaml b/packages/core/exceptions/pubspec.yaml index ca678c29..19d2d668 100644 --- a/packages/core/exceptions/pubspec.yaml +++ b/packages/core/exceptions/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_http_exception +name: protevus_http_exception version: 8.2.0 description: Exception class that can be serialized to JSON and serialized to clients. homepage: https://protevus-framework.web.app/ diff --git a/packages/core/framework/CHANGELOG.md b/packages/core/framework/CHANGELOG.md index c379fce2..fd5ec537 100644 --- a/packages/core/framework/CHANGELOG.md +++ b/packages/core/framework/CHANGELOG.md @@ -84,7 +84,7 @@ ## 4.2.1 -* Updated `package:angel3_container` +* Updated `package:protevus_container` ## 4.2.0 diff --git a/packages/core/framework/README.md b/packages/core/framework/README.md index d73370b6..69eb3151 100644 --- a/packages/core/framework/README.md +++ b/packages/core/framework/README.md @@ -1,8 +1,8 @@ # Protevus Framework -[![Protevus Framework](../../angel3_logo.png)](https://github.com/dart-backend/protevus) +[![Protevus Framework](../../protevus_logo.png)](https://github.com/dart-backend/protevus) -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_framework?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_framework?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/framework/LICENSE) @@ -42,10 +42,10 @@ This package is the core package of [Protevus](https://github.com/dart-backend/p 1. Download and install [Dart](https://dart.dev/get-dart) -2. Install the [Protevus CLI](https://pub.dev/packages/angel3_cli): +2. Install the [Protevus CLI](https://pub.dev/packages/protevus_cli): ```bash - dart pub global activate angel3_cli + dart pub global activate protevus_cli ``` 3. On terminal, create a new project: diff --git a/packages/core/framework/example/controller.dart b/packages/core/framework/example/controller.dart index a01ecfe0..ee5c4b06 100644 --- a/packages/core/framework/example/controller.dart +++ b/packages/core/framework/example/controller.dart @@ -1,6 +1,6 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; void main() async { diff --git a/packages/core/framework/example/handle_error.dart b/packages/core/framework/example/handle_error.dart index 93ca9b77..f6b026d6 100644 --- a/packages/core/framework/example/handle_error.dart +++ b/packages/core/framework/example/handle_error.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; void main() async { diff --git a/packages/core/framework/example/hostname.dart b/packages/core/framework/example/hostname.dart index 27ce85e3..374e6caf 100644 --- a/packages/core/framework/example/hostname.dart +++ b/packages/core/framework/example/hostname.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; Future apiConfigurer(Protevus app) async { diff --git a/packages/core/framework/example/http2/body_parsing.dart b/packages/core/framework/example/http2/body_parsing.dart index d81c24f1..8af74261 100644 --- a/packages/core/framework/example/http2/body_parsing.dart +++ b/packages/core/framework/example/http2/body_parsing.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_framework/http2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_framework/http2.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/core/framework/example/http2/main.dart b/packages/core/framework/example/http2/main.dart index e9583908..a059580f 100644 --- a/packages/core/framework/example/http2/main.dart +++ b/packages/core/framework/example/http2/main.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_framework/http2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_framework/http2.dart'; import 'package:logging/logging.dart'; import 'common.dart'; diff --git a/packages/core/framework/example/http2/server_push.dart b/packages/core/framework/example/http2/server_push.dart index eee69ced..b72c4638 100644 --- a/packages/core/framework/example/http2/server_push.dart +++ b/packages/core/framework/example/http2/server_push.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_framework/http2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_framework/http2.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/core/framework/example/json.dart b/packages/core/framework/example/json.dart index f173a069..73b0440a 100644 --- a/packages/core/framework/example/json.dart +++ b/packages/core/framework/example/json.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; import 'dart:isolate'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var x = 0; diff --git a/packages/core/framework/example/main.dart b/packages/core/framework/example/main.dart index d2baeb34..88b13f4a 100644 --- a/packages/core/framework/example/main.dart +++ b/packages/core/framework/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; void main() async { diff --git a/packages/core/framework/example/map_service.dart b/packages/core/framework/example/map_service.dart index 3dddbd30..3bfe3388 100644 --- a/packages/core/framework/example/map_service.dart +++ b/packages/core/framework/example/map_service.dart @@ -1,6 +1,6 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; void main() async { diff --git a/packages/core/framework/example/status.dart b/packages/core/framework/example/status.dart index 8a376863..d8013e0c 100644 --- a/packages/core/framework/example/status.dart +++ b/packages/core/framework/example/status.dart @@ -1,5 +1,5 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var app = Protevus(); diff --git a/packages/core/framework/example/view.dart b/packages/core/framework/example/view.dart index 052d3a38..9ba42e6a 100644 --- a/packages/core/framework/example/view.dart +++ b/packages/core/framework/example/view.dart @@ -1,6 +1,6 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var app = Protevus(reflector: MirrorsReflector()); diff --git a/packages/core/framework/lib/angel3_framework.dart b/packages/core/framework/lib/angel3_framework.dart deleted file mode 100644 index 529046cb..00000000 --- a/packages/core/framework/lib/angel3_framework.dart +++ /dev/null @@ -1,7 +0,0 @@ -/// An easily-extensible web server framework in Dart. -library angel3_framework; - -export 'package:angel3_http_exception/angel3_http_exception.dart'; -export 'package:angel3_model/angel3_model.dart'; -export 'package:angel3_route/angel3_route.dart'; -export 'src/core/core.dart'; diff --git a/packages/core/framework/lib/protevus_framework.dart b/packages/core/framework/lib/protevus_framework.dart new file mode 100644 index 00000000..ab713e50 --- /dev/null +++ b/packages/core/framework/lib/protevus_framework.dart @@ -0,0 +1,7 @@ +/// An easily-extensible web server framework in Dart. +library protevus_framework; + +export 'package:protevus_http_exception/protevus_http_exception.dart'; +export 'package:protevus_model/protevus_model.dart'; +export 'package:protevus_route/protevus_route.dart'; +export 'src/core/core.dart'; diff --git a/packages/core/framework/lib/src/core/controller.dart b/packages/core/framework/lib/src/core/controller.dart index 2955a3ae..399f189e 100644 --- a/packages/core/framework/lib/src/core/controller.dart +++ b/packages/core/framework/lib/src/core/controller.dart @@ -1,8 +1,8 @@ library angel_framework.http.controller; import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:meta/meta.dart'; import 'package:recase/recase.dart'; import '../core/core.dart'; diff --git a/packages/core/framework/lib/src/core/driver.dart b/packages/core/framework/lib/src/core/driver.dart index a13f3406..4d79b2e2 100644 --- a/packages/core/framework/lib/src/core/driver.dart +++ b/packages/core/framework/lib/src/core/driver.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io' show Cookie; -import 'package:angel3_http_exception/angel3_http_exception.dart'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:belatuk_combinator/belatuk_combinator.dart'; import 'package:stack_trace/stack_trace.dart'; import 'package:tuple/tuple.dart'; diff --git a/packages/core/framework/lib/src/core/hostname_router.dart b/packages/core/framework/lib/src/core/hostname_router.dart index c3887d94..1d20133c 100644 --- a/packages/core/framework/lib/src/core/hostname_router.dart +++ b/packages/core/framework/lib/src/core/hostname_router.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:logging/logging.dart'; import 'env.dart'; import 'hostname_parser.dart'; diff --git a/packages/core/framework/lib/src/core/map_service.dart b/packages/core/framework/lib/src/core/map_service.dart index 5ff9a281..ac69d8e6 100644 --- a/packages/core/framework/lib/src/core/map_service.dart +++ b/packages/core/framework/lib/src/core/map_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_http_exception/angel3_http_exception.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; import 'service.dart'; diff --git a/packages/core/framework/lib/src/core/metadata.dart b/packages/core/framework/lib/src/core/metadata.dart index 4203e20c..89c66e2b 100644 --- a/packages/core/framework/lib/src/core/metadata.dart +++ b/packages/core/framework/lib/src/core/metadata.dart @@ -1,6 +1,6 @@ library angel_framework.http.metadata; -import 'package:angel3_http_exception/angel3_http_exception.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; import 'hooked_service.dart' show HookedServiceEventListener; import 'request_context.dart'; diff --git a/packages/core/framework/lib/src/core/request_context.dart b/packages/core/framework/lib/src/core/request_context.dart index 85cd174e..c7a083cc 100644 --- a/packages/core/framework/lib/src/core/request_context.dart +++ b/packages/core/framework/lib/src/core/request_context.dart @@ -6,7 +6,7 @@ import 'dart:typed_data' show BytesBuilder; import 'dart:io' show Cookie, HeaderValue, HttpHeaders, HttpSession, InternetAddress; -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:http_parser/http_parser.dart'; import 'package:belatuk_http_server/belatuk_http_server.dart'; import 'package:meta/meta.dart'; diff --git a/packages/core/framework/lib/src/core/response_context.dart b/packages/core/framework/lib/src/core/response_context.dart index c352ecd8..834d2ba6 100644 --- a/packages/core/framework/lib/src/core/response_context.dart +++ b/packages/core/framework/lib/src/core/response_context.dart @@ -6,7 +6,7 @@ import 'dart:convert' as c show json; import 'dart:io' show BytesBuilder, Cookie; import 'dart:typed_data'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:file/file.dart'; import 'package:http_parser/http_parser.dart'; import 'package:mime/mime.dart'; diff --git a/packages/core/framework/lib/src/core/routable.dart b/packages/core/framework/lib/src/core/routable.dart index 5543f1ab..311029bf 100644 --- a/packages/core/framework/lib/src/core/routable.dart +++ b/packages/core/framework/lib/src/core/routable.dart @@ -2,8 +2,8 @@ library angel_framework.http.routable; import 'dart:async'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_route/protevus_route.dart'; import '../util.dart'; import 'hooked_service.dart'; @@ -49,7 +49,7 @@ class Routable extends Router { /// A [Map] of application-specific data that can be accessed. /// - /// Packages like `package:angel3_configuration` populate this map + /// Packages like `package:protevus_configuration` populate this map /// for you. final Map configuration = {}; diff --git a/packages/core/framework/lib/src/core/server.dart b/packages/core/framework/lib/src/core/server.dart index 089deb62..398ba6f6 100644 --- a/packages/core/framework/lib/src/core/server.dart +++ b/packages/core/framework/lib/src/core/server.dart @@ -3,9 +3,9 @@ library angel_framework.http.server; import 'dart:async'; import 'dart:collection' show HashMap; import 'dart:convert'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_http_exception/angel3_http_exception.dart'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:belatuk_combinator/belatuk_combinator.dart'; import 'package:http_parser/http_parser.dart'; import 'package:logging/logging.dart'; diff --git a/packages/core/framework/lib/src/core/service.dart b/packages/core/framework/lib/src/core/service.dart index 33e8b01d..ec47f844 100644 --- a/packages/core/framework/lib/src/core/service.dart +++ b/packages/core/framework/lib/src/core/service.dart @@ -1,7 +1,7 @@ library angel_framework.http.service; import 'dart:async'; -import 'package:angel3_http_exception/angel3_http_exception.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; import 'package:belatuk_merge_map/belatuk_merge_map.dart'; import 'package:quiver/core.dart'; import '../util.dart'; diff --git a/packages/core/framework/lib/src/http/angel_http.dart b/packages/core/framework/lib/src/http/angel_http.dart index 2ec7c970..95adef97 100644 --- a/packages/core/framework/lib/src/http/angel_http.dart +++ b/packages/core/framework/lib/src/http/angel_http.dart @@ -8,7 +8,7 @@ import 'dart:io' HttpServer, Platform, SecurityContext; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import '../core/core.dart'; import 'http_request_context.dart'; import 'http_response_context.dart'; diff --git a/packages/core/framework/lib/src/http/http_request_context.dart b/packages/core/framework/lib/src/http/http_request_context.dart index 142ab052..b5f03bb7 100644 --- a/packages/core/framework/lib/src/http/http_request_context.dart +++ b/packages/core/framework/lib/src/http/http_request_context.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; import 'package:http_parser/http_parser.dart'; import '../core/core.dart'; diff --git a/packages/core/framework/lib/src/http2/angel_http2.dart b/packages/core/framework/lib/src/http2/angel_http2.dart index 91ef4a98..2041a8be 100644 --- a/packages/core/framework/lib/src/http2/angel_http2.dart +++ b/packages/core/framework/lib/src/http2/angel_http2.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart' hide Header; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart' hide Header; +import 'package:protevus_framework/http.dart'; import 'package:http2/transport.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'http2_request_context.dart'; import 'http2_response_context.dart'; import 'package:uuid/uuid.dart'; diff --git a/packages/core/framework/lib/src/http2/http2_request_context.dart b/packages/core/framework/lib/src/http2/http2_request_context.dart index 6cb6c4bf..0a2b5c68 100644 --- a/packages/core/framework/lib/src/http2/http2_request_context.dart +++ b/packages/core/framework/lib/src/http2/http2_request_context.dart @@ -1,11 +1,11 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:collection/collection.dart' show IterableExtension; import 'package:http2/transport.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:uuid/uuid.dart'; final RegExp _comma = RegExp(r',\s*'); diff --git a/packages/core/framework/lib/src/http2/http2_response_context.dart b/packages/core/framework/lib/src/http2/http2_response_context.dart index 6dcbb5f9..39d224c1 100644 --- a/packages/core/framework/lib/src/http2/http2_response_context.dart +++ b/packages/core/framework/lib/src/http2/http2_response_context.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io' hide BytesBuilder; import 'dart:typed_data'; -import 'package:angel3_framework/angel3_framework.dart' hide Header; +import 'package:protevus_framework/protevus_framework.dart' hide Header; import 'package:http2/transport.dart'; import 'http2_request_context.dart'; diff --git a/packages/core/framework/lib/src/util.dart b/packages/core/framework/lib/src/util.dart index 77e22f85..afd41124 100644 --- a/packages/core/framework/lib/src/util.dart +++ b/packages/core/framework/lib/src/util.dart @@ -1,4 +1,4 @@ -import 'package:angel3_container/angel3_container.dart'; +import 'package:protevus_container/protevus_container.dart'; final RegExp straySlashes = RegExp(r'(^/+)|(/+$)'); diff --git a/packages/core/framework/performance/hello/main.dart b/packages/core/framework/performance/hello/main.dart index eeb2cc5b..e2a96b8d 100644 --- a/packages/core/framework/performance/hello/main.dart +++ b/packages/core/framework/performance/hello/main.dart @@ -1,8 +1,8 @@ /// A basic server that prints "Hello, world!" library performance.hello; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; void main() async { var app = Protevus(); diff --git a/packages/core/framework/pubspec.yaml b/packages/core/framework/pubspec.yaml index 6b8dfd95..8a6c1e0b 100644 --- a/packages/core/framework/pubspec.yaml +++ b/packages/core/framework/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_framework +name: protevus_framework version: 8.4.0 description: A high-powered HTTP server extensible framework with dependency injection, routing and much more. homepage: https://protevus-framework.web.app/ @@ -6,11 +6,11 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/framew environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_container: ^8.0.0 - angel3_http_exception: ^8.0.0 - angel3_model: ^8.0.0 - angel3_route: ^8.0.0 - angel3_mock_request: ^8.0.0 + protevus_container: ^8.0.0 + protevus_http_exception: ^8.0.0 + protevus_model: ^8.0.0 + protevus_route: ^8.0.0 + protevus_mock_request: ^8.0.0 belatuk_merge_map: ^5.1.0 belatuk_combinator: ^5.1.0 belatuk_http_server: ^4.1.0 @@ -36,14 +36,14 @@ dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request diff --git a/packages/core/framework/test/accepts_test.dart b/packages/core/framework/test/accepts_test.dart index ead248e4..53e40914 100644 --- a/packages/core/framework/test/accepts_test.dart +++ b/packages/core/framework/test/accepts_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; final Uri endpoint = Uri.parse('http://example.com/accept'); diff --git a/packages/core/framework/test/anonymous_service_test.dart b/packages/core/framework/test/anonymous_service_test.dart index cc94bdf7..72326c94 100644 --- a/packages/core/framework/test/anonymous_service_test.dart +++ b/packages/core/framework/test/anonymous_service_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/body_test.dart b/packages/core/framework/test/body_test.dart index 1b0b42fc..27e69ab6 100644 --- a/packages/core/framework/test/body_test.dart +++ b/packages/core/framework/test/body_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/common.dart b/packages/core/framework/test/common.dart index 2de9b70f..d20cd612 100644 --- a/packages/core/framework/test/common.dart +++ b/packages/core/framework/test/common.dart @@ -1,6 +1,6 @@ library angel_framework.test.common; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:matcher/matcher.dart'; class Todo extends Model { diff --git a/packages/core/framework/test/controller_test.dart b/packages/core/framework/test/controller_test.dart index 5224a4c6..f4e210c4 100644 --- a/packages/core/framework/test/controller_test.dart +++ b/packages/core/framework/test/controller_test.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http/http.dart' as http; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/core/framework/test/detach_test.dart b/packages/core/framework/test/detach_test.dart index 0303afcc..a724b074 100644 --- a/packages/core/framework/test/detach_test.dart +++ b/packages/core/framework/test/detach_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/di_test.dart b/packages/core/framework/test/di_test.dart index a5ee561b..09de72a1 100644 --- a/packages/core/framework/test/di_test.dart +++ b/packages/core/framework/test/di_test.dart @@ -1,12 +1,12 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:http/http.dart' as http; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/core/framework/test/encoders_buffer_test.dart b/packages/core/framework/test/encoders_buffer_test.dart index 296df7ba..44ab3d21 100644 --- a/packages/core/framework/test/encoders_buffer_test.dart +++ b/packages/core/framework/test/encoders_buffer_test.dart @@ -3,10 +3,10 @@ import 'dart:convert'; import 'dart:io' hide BytesBuilder; import 'dart:typed_data' show BytesBuilder; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; Future> getBody(MockHttpResponse rs) async { diff --git a/packages/core/framework/test/env_test.dart b/packages/core/framework/test/env_test.dart index 7da50c1f..32c4beac 100644 --- a/packages/core/framework/test/env_test.dart +++ b/packages/core/framework/test/env_test.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/exception_test.dart b/packages/core/framework/test/exception_test.dart index 77364b73..35d71c12 100644 --- a/packages/core/framework/test/exception_test.dart +++ b/packages/core/framework/test/exception_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'dart:convert'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/extension_test.dart b/packages/core/framework/test/extension_test.dart index 5302c6f9..a4916f21 100644 --- a/packages/core/framework/test/extension_test.dart +++ b/packages/core/framework/test/extension_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; final Uri endpoint = Uri.parse('http://example.com'); diff --git a/packages/core/framework/test/find_one_test.dart b/packages/core/framework/test/find_one_test.dart index 082e45b2..865db621 100644 --- a/packages/core/framework/test/find_one_test.dart +++ b/packages/core/framework/test/find_one_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/core/framework/test/general_test.dart b/packages/core/framework/test/general_test.dart index 331a6db3..e349b15c 100644 --- a/packages/core/framework/test/general_test.dart +++ b/packages/core/framework/test/general_test.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/hooked_test.dart b/packages/core/framework/test/hooked_test.dart index 09b45a90..0e84f828 100644 --- a/packages/core/framework/test/hooked_test.dart +++ b/packages/core/framework/test/hooked_test.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http/http.dart' as http; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/core/framework/test/http2/adapter_test.dart b/packages/core/framework/test/http2/adapter_test.dart index ec1bd58a..09592d2f 100644 --- a/packages/core/framework/test/http2/adapter_test.dart +++ b/packages/core/framework/test/http2/adapter_test.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io' hide BytesBuilder; import 'dart:typed_data'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart' hide Header; -import 'package:angel3_framework/http2.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart' hide Header; +import 'package:protevus_framework/http2.dart'; import 'package:collection/collection.dart' show IterableExtension; import 'package:http/src/multipart_file.dart' as http; import 'package:http/src/multipart_request.dart' as http; diff --git a/packages/core/framework/test/http_404_hole_test.dart b/packages/core/framework/test/http_404_hole_test.dart index 0ddf8dce..f84660f9 100644 --- a/packages/core/framework/test/http_404_hole_test.dart +++ b/packages/core/framework/test/http_404_hole_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:charcode/ascii.dart'; import 'package:http/io_client.dart' as http; import 'package:logging/logging.dart'; diff --git a/packages/core/framework/test/jsonp_test.dart b/packages/core/framework/test/jsonp_test.dart index 033a46e7..c21d2628 100644 --- a/packages/core/framework/test/jsonp_test.dart +++ b/packages/core/framework/test/jsonp_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http_parser/http_parser.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/parameter_meta_test.dart b/packages/core/framework/test/parameter_meta_test.dart index 625de5a6..0d9c7452 100644 --- a/packages/core/framework/test/parameter_meta_test.dart +++ b/packages/core/framework/test/parameter_meta_test.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/parse_id_test.dart b/packages/core/framework/test/parse_id_test.dart index d99cc907..da3a8df1 100644 --- a/packages/core/framework/test/parse_id_test.dart +++ b/packages/core/framework/test/parse_id_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/precontained_test.dart b/packages/core/framework/test/precontained_test.dart index fcb40e5a..7188c740 100644 --- a/packages/core/framework/test/precontained_test.dart +++ b/packages/core/framework/test/precontained_test.dart @@ -1,9 +1,9 @@ import 'dart:convert'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/primitives_test.dart b/packages/core/framework/test/primitives_test.dart index 5064935a..8cc6b635 100644 --- a/packages/core/framework/test/primitives_test.dart +++ b/packages/core/framework/test/primitives_test.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'dart:io' show stderr; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/repeat_request_test.dart b/packages/core/framework/test/repeat_request_test.dart index 5ac49546..568bdf82 100644 --- a/packages/core/framework/test/repeat_request_test.dart +++ b/packages/core/framework/test/repeat_request_test.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/req_shutdown_test.dart b/packages/core/framework/test/req_shutdown_test.dart index cd45b489..87a8f611 100644 --- a/packages/core/framework/test/req_shutdown_test.dart +++ b/packages/core/framework/test/req_shutdown_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http/io_client.dart' as http; import 'package:logging/logging.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/response_header_test.dart b/packages/core/framework/test/response_header_test.dart index 224c5851..940f775f 100644 --- a/packages/core/framework/test/response_header_test.dart +++ b/packages/core/framework/test/response_header_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/src/http/angel_http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/src/http/angel_http.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/framework/test/routing_test.dart b/packages/core/framework/test/routing_test.dart index 7d74d95d..7bff0169 100644 --- a/packages/core/framework/test/routing_test.dart +++ b/packages/core/framework/test/routing_test.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http/http.dart' as http; import 'package:io/ansi.dart'; import 'package:logging/logging.dart'; diff --git a/packages/core/framework/test/serialize_test.dart b/packages/core/framework/test/serialize_test.dart index 2f2105eb..9615d259 100644 --- a/packages/core/framework/test/serialize_test.dart +++ b/packages/core/framework/test/serialize_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http/http.dart' as http; import 'package:http_parser/http_parser.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/server_test.dart b/packages/core/framework/test/server_test.dart index 6da6c9c6..bdf41d4a 100644 --- a/packages/core/framework/test/server_test.dart +++ b/packages/core/framework/test/server_test.dart @@ -2,10 +2,10 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/service_map_test.dart b/packages/core/framework/test/service_map_test.dart index 3bfafaa0..fd240209 100644 --- a/packages/core/framework/test/service_map_test.dart +++ b/packages/core/framework/test/service_map_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:test/test.dart'; import 'package:quiver/core.dart'; diff --git a/packages/core/framework/test/services_test.dart b/packages/core/framework/test/services_test.dart index 87a1f39e..9fe9533e 100644 --- a/packages/core/framework/test/services_test.dart +++ b/packages/core/framework/test/services_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'dart:convert'; import 'package:http/http.dart' as http; import 'package:stack_trace/stack_trace.dart'; diff --git a/packages/core/framework/test/streaming_test.dart b/packages/core/framework/test/streaming_test.dart index 70dfb2ef..7264a01d 100644 --- a/packages/core/framework/test/streaming_test.dart +++ b/packages/core/framework/test/streaming_test.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; diff --git a/packages/core/framework/test/view_generator_test.dart b/packages/core/framework/test/view_generator_test.dart index 3155783f..7986e048 100644 --- a/packages/core/framework/test/view_generator_test.dart +++ b/packages/core/framework/test/view_generator_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/mocking/README.md b/packages/core/mocking/README.md index a2950561..a508d906 100644 --- a/packages/core/mocking/README.md +++ b/packages/core/mocking/README.md @@ -1,6 +1,6 @@ # Mock HTTP Request -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_mock_request?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_mock_request?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/mock_request/LICENSE) diff --git a/packages/core/mocking/example/main.dart b/packages/core/mocking/example/main.dart index 455e2728..a974a0a4 100644 --- a/packages/core/mocking/example/main.dart +++ b/packages/core/mocking/example/main.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; Future main() async { var rq = diff --git a/packages/core/mocking/lib/angel3_mock_request.dart b/packages/core/mocking/lib/protevus_mock_request.dart similarity index 100% rename from packages/core/mocking/lib/angel3_mock_request.dart rename to packages/core/mocking/lib/protevus_mock_request.dart diff --git a/packages/core/mocking/pubspec.yaml b/packages/core/mocking/pubspec.yaml index bf2c8ef7..81fa59f9 100644 --- a/packages/core/mocking/pubspec.yaml +++ b/packages/core/mocking/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_mock_request +name: protevus_mock_request version: 8.2.0 description: Manufacture dart:io HttpRequests, HttpResponses, HttpHeaders, etc. homepage: https://protevus-framework.web.app/ @@ -8,18 +8,18 @@ environment: dependencies: charcode: ^1.3.0 dev_dependencies: - #angel3_framework: ^7.0.0 + #protevus_framework: ^7.0.0 http: ^1.0.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_route: +# protevus_route: # path: ../route -# angel3_model: +# protevus_model: # path: ../model -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_container: +# protevus_container: # path: ../container/angel_container \ No newline at end of file diff --git a/packages/core/mocking/test/all_test.dart b/packages/core/mocking/test/all_test.dart index f7f65b66..e2279c41 100644 --- a/packages/core/mocking/test/all_test.dart +++ b/packages/core/mocking/test/all_test.dart @@ -1,8 +1,8 @@ //import 'dart:convert'; //import 'dart:io'; -//import 'package:angel3_framework/angel3_framework.dart'; -//import 'package:angel3_framework/http.dart'; -//import 'package:angel3_mock_request/angel3_mock_request.dart'; +//import 'package:protevus_framework/protevus_framework.dart'; +//import 'package:protevus_framework/http.dart'; +//import 'package:protevus_mock_request/protevus_mock_request.dart'; //import 'package:test/test.dart'; void main() { diff --git a/packages/core/model/README.md b/packages/core/model/README.md index 7b8d7139..9ee18125 100644 --- a/packages/core/model/README.md +++ b/packages/core/model/README.md @@ -1,6 +1,6 @@ # Protevus Data Model -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_model?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_model?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/model/LICENSE) @@ -8,7 +8,7 @@ The basic data models for Protevus framework. ```dart -import 'package:angel3_model/angel3_model.dart'; +import 'package:protevus_model/protevus_model.dart'; ``` The available data models are: diff --git a/packages/core/model/example/main.dart b/packages/core/model/example/main.dart index d01d5874..e615bcee 100644 --- a/packages/core/model/example/main.dart +++ b/packages/core/model/example/main.dart @@ -1,4 +1,4 @@ -import 'package:angel3_model/angel3_model.dart'; +import 'package:protevus_model/protevus_model.dart'; void main() { var todo = Todo(id: '34', isComplete: false); diff --git a/packages/core/model/lib/angel3_model.dart b/packages/core/model/lib/protevus_model.dart similarity index 100% rename from packages/core/model/lib/angel3_model.dart rename to packages/core/model/lib/protevus_model.dart diff --git a/packages/core/model/pubspec.yaml b/packages/core/model/pubspec.yaml index 0874c07d..17109428 100644 --- a/packages/core/model/pubspec.yaml +++ b/packages/core/model/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_model +name: protevus_model version: 8.2.0 description: Protevus basic data model class, no longer with the added weight of the whole framework. homepage: https://protevus-framework.web.app/ diff --git a/packages/core/route/README.md b/packages/core/route/README.md index 478ce504..716d1358 100644 --- a/packages/core/route/README.md +++ b/packages/core/route/README.md @@ -1,15 +1,15 @@ # Protevus Route -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_route?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_route?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/route/LICENSE) A powerful, isomorphic routing library for Dart. -`angel3_route` exposes a routing system that takes the shape of a tree. This tree structure can be easily navigated, in a fashion somewhat similar to a filesystem. The `Router` API is a very straightforward interface that allows for your code to take a shape similar to the route tree. Users of Laravel and Express will be very happy. +`protevus_route` exposes a routing system that takes the shape of a tree. This tree structure can be easily navigated, in a fashion somewhat similar to a filesystem. The `Router` API is a very straightforward interface that allows for your code to take a shape similar to the route tree. Users of Laravel and Express will be very happy. -`angel3_route` does not require the use of [Protevus 3](https://pub.dev/packages/angel3_framework), and has minimal dependencies. Thus, it can be used in any application, regardless of framework. This includes Web apps, Flutter apps, CLI apps, and smaller servers which do not need all the features of the Protevus framework. +`protevus_route` does not require the use of [Protevus 3](https://pub.dev/packages/protevus_framework), and has minimal dependencies. Thus, it can be used in any application, regardless of framework. This includes Web apps, Flutter apps, CLI apps, and smaller servers which do not need all the features of the Protevus framework. ## Contents @@ -26,7 +26,7 @@ A powerful, isomorphic routing library for Dart. ### Routing -If you use [Protevus](https://pub.dev/packages/angel3_framework), every `Protevus` instance is a `Router` in itself. +If you use [Protevus](https://pub.dev/packages/protevus_framework), every `Protevus` instance is a `Router` in itself. ```dart void main() { @@ -97,7 +97,7 @@ See [the tests](test/route/no_params.dart) for good examples. Supports both hashed routes and pushState. The `BrowserRouter` interface exposes a `Stream onRoute`, which can be listened to for changes. It will fire `"NULL"` whenever no route is matched. -`angel3_route` will also automatically intercept `` elements and redirect them to your routes. +`protevus_route` will also automatically intercept `` elements and redirect them to your routes. To prevent this for a given anchor, do any of the following: diff --git a/packages/core/route/example/main.dart b/packages/core/route/example/main.dart index 0645dfa2..533d4460 100644 --- a/packages/core/route/example/main.dart +++ b/packages/core/route/example/main.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; void main() { final router = Router(); diff --git a/packages/core/route/lib/browser.dart b/packages/core/route/lib/browser.dart index 39596816..0151b08c 100644 --- a/packages/core/route/lib/browser.dart +++ b/packages/core/route/lib/browser.dart @@ -2,7 +2,7 @@ import 'dart:async' show Stream, StreamController; import 'dart:html'; import 'package:path/path.dart' as p; -import 'angel3_route.dart'; +import 'protevus_route.dart'; final RegExp _hash = RegExp(r'^#/'); final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)'); diff --git a/packages/core/route/lib/angel3_route.dart b/packages/core/route/lib/protevus_route.dart similarity index 81% rename from packages/core/route/lib/angel3_route.dart rename to packages/core/route/lib/protevus_route.dart index fcfc092b..b7e41ade 100644 --- a/packages/core/route/lib/angel3_route.dart +++ b/packages/core/route/lib/protevus_route.dart @@ -1,4 +1,4 @@ -library angel3_route; +library protevus_route; export 'src/middleware_pipeline.dart'; export 'src/router.dart'; diff --git a/packages/core/route/lib/src/router.dart b/packages/core/route/lib/src/router.dart index 208253b6..b081388b 100644 --- a/packages/core/route/lib/src/router.dart +++ b/packages/core/route/lib/src/router.dart @@ -1,4 +1,4 @@ -library angel3_route.src.router; +library protevus_route.src.router; import 'dart:async'; import 'package:belatuk_combinator/belatuk_combinator.dart'; diff --git a/packages/core/route/lib/string_util.dart b/packages/core/route/lib/string_util.dart index d8eb2282..eab693a7 100644 --- a/packages/core/route/lib/string_util.dart +++ b/packages/core/route/lib/string_util.dart @@ -1,5 +1,5 @@ /// Helper functions to performantly transform strings, without `RegExp`. -library angel3_route.string_util; +library protevus_route.string_util; /// Removes leading and trailing occurrences of a pattern from a string. String stripStray(String haystack, String needle) { diff --git a/packages/core/route/pubspec.yaml b/packages/core/route/pubspec.yaml index 622147dc..9001f11e 100644 --- a/packages/core/route/pubspec.yaml +++ b/packages/core/route/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_route +name: protevus_route version: 8.2.0 description: A powerful, isomorphic routing library for Dart. It is mainly used in the Protevus framework, but can be used in Flutter and on the Web. homepage: https://protevus-framework.web.app/ diff --git a/packages/core/route/test/chain_nest_test.dart b/packages/core/route/test/chain_nest_test.dart index 66f2fbad..9899acc5 100644 --- a/packages/core/route/test/chain_nest_test.dart +++ b/packages/core/route/test/chain_nest_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/navigate_test.dart b/packages/core/route/test/navigate_test.dart index 6c321e65..e82cb64d 100644 --- a/packages/core/route/test/navigate_test.dart +++ b/packages/core/route/test/navigate_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/params_test.dart b/packages/core/route/test/params_test.dart index 3110ae8f..d2de41da 100644 --- a/packages/core/route/test/params_test.dart +++ b/packages/core/route/test/params_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/parse_test.dart b/packages/core/route/test/parse_test.dart index 12913d14..3ff693ab 100644 --- a/packages/core/route/test/parse_test.dart +++ b/packages/core/route/test/parse_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/root_test.dart b/packages/core/route/test/root_test.dart index e1def74f..29f0c6d4 100644 --- a/packages/core/route/test/root_test.dart +++ b/packages/core/route/test/root_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/server_test.dart b/packages/core/route/test/server_test.dart index bbe26e80..c4ca5929 100644 --- a/packages/core/route/test/server_test.dart +++ b/packages/core/route/test/server_test.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:http/http.dart' as http; import 'package:test/test.dart'; diff --git a/packages/core/route/test/strip_test.dart b/packages/core/route/test/strip_test.dart index 7d7c1e71..4498800f 100644 --- a/packages/core/route/test/strip_test.dart +++ b/packages/core/route/test/strip_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/string_util.dart'; +import 'package:protevus_route/string_util.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/uri_decode_test.dart b/packages/core/route/test/uri_decode_test.dart index f48122ce..f98c3efb 100644 --- a/packages/core/route/test/uri_decode_test.dart +++ b/packages/core/route/test/uri_decode_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/test/wildcard_test.dart b/packages/core/route/test/wildcard_test.dart index 07869c9f..eb9f9877 100644 --- a/packages/core/route/test/wildcard_test.dart +++ b/packages/core/route/test/wildcard_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/angel3_route.dart'; +import 'package:protevus_route/protevus_route.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/core/route/web/hash/basic.dart b/packages/core/route/web/hash/basic.dart index 6d52c9a1..176e64f3 100644 --- a/packages/core/route/web/hash/basic.dart +++ b/packages/core/route/web/hash/basic.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/browser.dart'; +import 'package:protevus_route/browser.dart'; import '../shared/basic.dart'; void main() => basic(BrowserRouter(hash: true)); diff --git a/packages/core/route/web/push_state/basic.dart b/packages/core/route/web/push_state/basic.dart index ca2bfca4..b53d5f90 100644 --- a/packages/core/route/web/push_state/basic.dart +++ b/packages/core/route/web/push_state/basic.dart @@ -1,4 +1,4 @@ -import 'package:angel3_route/browser.dart'; +import 'package:protevus_route/browser.dart'; import '../shared/basic.dart'; void main() => basic(BrowserRouter()); diff --git a/packages/core/route/web/shared/basic.dart b/packages/core/route/web/shared/basic.dart index 6cb4e174..4a554ce9 100644 --- a/packages/core/route/web/shared/basic.dart +++ b/packages/core/route/web/shared/basic.dart @@ -1,5 +1,5 @@ import 'dart:html'; -import 'package:angel3_route/browser.dart'; +import 'package:protevus_route/browser.dart'; void basic(BrowserRouter router) { final $h1 = window.document.querySelector('h1'); diff --git a/packages/cors/README.md b/packages/cors/README.md index 677fcd1c..b3a94681 100644 --- a/packages/cors/README.md +++ b/packages/cors/README.md @@ -1,6 +1,6 @@ # Protevus CORS middleware -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_cors?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_cors?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/cors/LICENSE) diff --git a/packages/cors/example/example.dart b/packages/cors/example/example.dart index 6c2e8e78..c06bea12 100644 --- a/packages/cors/example/example.dart +++ b/packages/cors/example/example.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_cors/angel3_cors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_cors/protevus_cors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; Future configureServer(Protevus app) async { // The default options will allow CORS for any request. diff --git a/packages/cors/lib/angel3_cors.dart b/packages/cors/lib/protevus_cors.dart similarity index 97% rename from packages/cors/lib/angel3_cors.dart rename to packages/cors/lib/protevus_cors.dart index c4581654..133efc69 100644 --- a/packages/cors/lib/angel3_cors.dart +++ b/packages/cors/lib/protevus_cors.dart @@ -1,9 +1,9 @@ /// Protevus CORS middleware. -library angel3_cors; +library protevus_cors; import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'src/cors_options.dart'; export 'src/cors_options.dart'; diff --git a/packages/cors/pubspec.yaml b/packages/cors/pubspec.yaml index 34ddf013..20fdede8 100644 --- a/packages/cors/pubspec.yaml +++ b/packages/cors/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_cors +name: protevus_cors version: 8.2.0 description: Protevus CORS middleware. Ported from expressjs/cors to Protevus framework. homepage: https://protevus-framework.web.app/ @@ -6,32 +6,32 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/cors environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 http: ^1.0.0 lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_validate: +# protevus_validate: # path: ../validate -# angel3_test: +# protevus_test: # path: ../test diff --git a/packages/cors/test/cors_test.dart b/packages/cors/test/cors_test.dart index 283e3e2a..51ee3282 100644 --- a/packages/cors/test/cors_test.dart +++ b/packages/cors/test/cors_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_cors/angel3_cors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_cors/protevus_cors.dart'; import 'package:http/http.dart' as http; import 'package:test/test.dart'; diff --git a/packages/file_service/README.md b/packages/file_service/README.md index c53fdc85..d6f8c76b 100644 --- a/packages/file_service/README.md +++ b/packages/file_service/README.md @@ -1,6 +1,6 @@ # File Service for Protevus -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_file_service?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_file_service?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/file_service/LICENSE) diff --git a/packages/file_service/example/main.dart b/packages/file_service/example/main.dart index 470b1ca2..916acd08 100644 --- a/packages/file_service/example/main.dart +++ b/packages/file_service/example/main.dart @@ -1,5 +1,5 @@ -import 'package:angel3_file_service/angel3_file_service.dart'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_file_service/protevus_file_service.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/local.dart'; void configureServer(Protevus app) async { diff --git a/packages/file_service/lib/angel3_file_service.dart b/packages/file_service/lib/protevus_file_service.dart similarity index 98% rename from packages/file_service/lib/angel3_file_service.dart rename to packages/file_service/lib/protevus_file_service.dart index 31e6ef0e..c0e22be8 100644 --- a/packages/file_service/lib/angel3_file_service.dart +++ b/packages/file_service/lib/protevus_file_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/file.dart'; import 'package:pool/pool.dart'; diff --git a/packages/file_service/pubspec.yaml b/packages/file_service/pubspec.yaml index 1718b9e4..e7c5450e 100644 --- a/packages/file_service/pubspec.yaml +++ b/packages/file_service/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_file_service +name: protevus_file_service version: 8.2.0 description: Protevus service that persists data to a file on disk, stored as a JSON list. homepage: https://protevus-framework.web.app/ @@ -6,22 +6,22 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/file_s environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 file: ^7.0.0 pool: ^1.5.0 dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request diff --git a/packages/file_service/test/all_test.dart b/packages/file_service/test/all_test.dart index d5255c19..b147f48f 100644 --- a/packages/file_service/test/all_test.dart +++ b/packages/file_service/test/all_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_file_service/angel3_file_service.dart'; +import 'package:protevus_file_service/protevus_file_service.dart'; import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:test/test.dart'; diff --git a/packages/hot/README.md b/packages/hot/README.md index 73214a6f..90afc2f8 100644 --- a/packages/hot/README.md +++ b/packages/hot/README.md @@ -1,13 +1,13 @@ # Protevus Hot Reloader -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_hot?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_hot?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/hot/LICENSE) ![Screenshot of terminal](screenshots/protevus-screenshot.png) -Supports *hot reloading* of Protevus servers on file changes. This is faster and more reliable than merely reactively restarting a `Process`. This package only works with the [Protevus framework](https://pub.dev/packages/angel3_framework). +Supports *hot reloading* of Protevus servers on file changes. This is faster and more reliable than merely reactively restarting a `Process`. This package only works with the [Protevus framework](https://pub.dev/packages/protevus_framework). **Not recommended to use in production, unless you are specifically intending for a "hot code push" in production.** @@ -17,8 +17,8 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^8.0.0 - angel3_hot: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_hot: ^8.0.0 ``` ## Usage @@ -37,8 +37,8 @@ You can watch: import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_hot/angel3_hot.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_hot/protevus_hot.dart'; import 'package:logging/logging.dart'; import 'src/foo.dart'; @@ -46,7 +46,7 @@ main() async { var hot = HotReloader(createServer, [ Directory('src'), 'main.dart', - Uri.parse('package:angel3_hot/angel3_hot.dart') + Uri.parse('package:protevus_hot/protevus_hot.dart') ]); await hot.startServer('127.0.0.1', 3000); } @@ -84,7 +84,7 @@ The following code snippet removes `X-FRAME-OPTIONS` and adds `X-XSRF-TOKEN` to ```dart import 'dart:io'; -import 'package:angel3_hot/angel3_hot.dart'; +import 'package:protevus_hot/protevus_hot.dart'; import 'server.dart'; void main() async { @@ -92,7 +92,7 @@ void main() async { Directory('src'), 'server.dart', // Also allowed: Platform.script, - Uri.parse('package:angel3_hot/angel3_hot.dart') + Uri.parse('package:protevus_hot/protevus_hot.dart') ]); var http = await hot.startServer('127.0.0.1', 3000); diff --git a/packages/hot/example/main.dart b/packages/hot/example/main.dart index 616da43e..ab811863 100644 --- a/packages/hot/example/main.dart +++ b/packages/hot/example/main.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:angel3_hot/angel3_hot.dart'; +import 'package:protevus_hot/protevus_hot.dart'; import 'server.dart'; void main() async { @@ -7,7 +7,7 @@ void main() async { Directory('src'), 'server.dart', // Also allowed: Platform.script, - Uri.parse('package:angel3_hot/angel3_hot.dart') + Uri.parse('package:protevus_hot/protevus_hot.dart') ]); await hot.startServer('127.0.0.1', 3000); } diff --git a/packages/hot/example/server.dart b/packages/hot/example/server.dart index 91a23316..1b4f1fdf 100644 --- a/packages/hot/example/server.dart +++ b/packages/hot/example/server.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:logging/logging.dart'; import 'src/foo.dart'; diff --git a/packages/hot/lib/angel3_hot.dart b/packages/hot/lib/protevus_hot.dart similarity index 98% rename from packages/hot/lib/angel3_hot.dart rename to packages/hot/lib/protevus_hot.dart index a8e03793..8d35b543 100644 --- a/packages/hot/lib/angel3_hot.dart +++ b/packages/hot/lib/protevus_hot.dart @@ -4,9 +4,9 @@ import 'dart:convert'; import 'dart:developer' as dev; import 'dart:io'; import 'dart:isolate'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_websocket/server.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_websocket/server.dart'; import 'package:charcode/ascii.dart'; import 'package:glob/glob.dart'; import 'package:glob/list_local_fs.dart'; diff --git a/packages/hot/pubspec.yaml b/packages/hot/pubspec.yaml index b78b6196..a4ebda78 100644 --- a/packages/hot/pubspec.yaml +++ b/packages/hot/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_hot +name: protevus_hot version: 8.3.0 description: Supports hot reloading/hot code push of Protevus servers on file changes. homepage: https://protevus-framework.web.app/ @@ -6,8 +6,8 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/hot environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.2.0 - angel3_websocket: ^8.1.0 + protevus_framework: ^8.2.0 + protevus_websocket: ^8.1.0 belatuk_html_builder: ^5.1.0 charcode: ^1.3.0 glob: ^2.1.0 @@ -20,22 +20,22 @@ dev_dependencies: http: ^1.0.0 lints: ^4.0.0 #dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_websocket: +# protevus_websocket: # path: ../websocket \ No newline at end of file diff --git a/packages/html/README.md b/packages/html/README.md index 76d6e44d..4a8d72f3 100644 --- a/packages/html/README.md +++ b/packages/html/README.md @@ -1,6 +1,6 @@ # Protevus HTML -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_html?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_html?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/html/LICENSE) @@ -27,7 +27,7 @@ Node myDom = html(lang: 'en', c: [ ]); ``` -This plug-in means that you can now `return` these AST's, and Protevus will automatically send them to clients. Ultimately, the implication is that you can use `belatuk_html_builder` as a substitute for a templating system within Dart. With [hot reloading](https://pub.dev/packages/angel3_hot), you won't even need to reload your server (as it should be). +This plug-in means that you can now `return` these AST's, and Protevus will automatically send them to clients. Ultimately, the implication is that you can use `belatuk_html_builder` as a substitute for a templating system within Dart. With [hot reloading](https://pub.dev/packages/protevus_hot), you won't even need to reload your server (as it should be). ## Installation @@ -35,7 +35,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_html: ^6.0.0 + protevus_html: ^6.0.0 ``` ## Usage diff --git a/packages/html/example/main.dart b/packages/html/example/main.dart index ab319a73..4583dc5e 100644 --- a/packages/html/example/main.dart +++ b/packages/html/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_html/angel3_html.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_html/protevus_html.dart'; import 'package:belatuk_html_builder/elements.dart'; import 'package:logging/logging.dart'; diff --git a/packages/html/lib/angel3_html.dart b/packages/html/lib/protevus_html.dart similarity index 94% rename from packages/html/lib/angel3_html.dart rename to packages/html/lib/protevus_html.dart index e10ba76f..d53f611c 100644 --- a/packages/html/lib/angel3_html.dart +++ b/packages/html/lib/protevus_html.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:belatuk_html_builder/belatuk_html_builder.dart'; /// Returns a [RequestMiddleware] that allows you to return `html_builder` [Node]s as responses. diff --git a/packages/html/pubspec.yaml b/packages/html/pubspec.yaml index 0fc7db3f..eb14e20a 100644 --- a/packages/html/pubspec.yaml +++ b/packages/html/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_html +name: protevus_html version: 8.1.0 description: Support for rendering html_builder AST's as responses in Protevus. homepage: https://protevus-framework.web.app/ @@ -6,34 +6,34 @@ repository: https://github.com/dart-backend/protevus/tree/protevus/packages/html environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 belatuk_html_builder: ^5.0.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 html: ^0.15.0 logging: ^1.0.1 test: ^1.21.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_test: +# protevus_test: # path: ../test -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_validate: +# protevus_validate: # path: ../validate -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route diff --git a/packages/html/test/all_test.dart b/packages/html/test/all_test.dart index c3f3611f..51514452 100644 --- a/packages/html/test/all_test.dart +++ b/packages/html/test/all_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_html/angel3_html.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_html/protevus_html.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:belatuk_html_builder/elements.dart'; import 'package:test/test.dart'; diff --git a/packages/jael/README.md b/packages/jael/README.md index f853109e..8535ac05 100644 --- a/packages/jael/README.md +++ b/packages/jael/README.md @@ -28,4 +28,4 @@ Within this repository are three packages: * `package:jael3` - Contains the Jael parser, AST, and HTML renderer. * `package:jael3_preprocessor` - Handles template inheritance, and facilitates the use of "compile-time" constructs. -* `package:angel3_jael` - [Protevus](https://protevus-framework.web.app/) support for Jael. +* `package:protevus_jael` - [Protevus](https://protevus-framework.web.app/) support for Jael. diff --git a/packages/jael/angel_jael/README.md b/packages/jael/angel_jael/README.md index fe75418e..5ce4c848 100644 --- a/packages/jael/angel_jael/README.md +++ b/packages/jael/angel_jael/README.md @@ -1,11 +1,11 @@ # Protevus Jael -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_jael?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_jael?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/jael/angel_jael/LICENSE) -[Protevus 3](https://pub.dev/packages/angel3_framework) support for [Jael 3](https://pub.dev/packages/jael3). +[Protevus 3](https://pub.dev/packages/protevus_framework) support for [Jael 3](https://pub.dev/packages/jael3). ## Installation @@ -13,7 +13,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_jael: ^8.0.0 + protevus_jael: ^8.0.0 ``` ## Usage @@ -21,8 +21,8 @@ dependencies: Just like `mustache` and other renderers, configuring Protevus to use Jael is as simple as calling `app.configure`: ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_jael/angel3_jael.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_jael/protevus_jael.dart'; import 'package:file/file.dart'; AngelConfigurer myPlugin(FileSystem fileSystem) { @@ -35,7 +35,7 @@ AngelConfigurer myPlugin(FileSystem fileSystem) { } ``` -`package:angel3_jael` supports caching views and minified html output by default, to improve performance. You might want to disable them in development, so consider setting these flags to `false`: +`package:protevus_jael` supports caching views and minified html output by default, to improve performance. You might want to disable them in development, so consider setting these flags to `false`: ```dart jael(viewsDirectory, cacheViews: false, minified: false); @@ -46,8 +46,8 @@ Keep in mind that this package uses `package:file`, rather than `dart:io`. The following is a basic example of a server setup that can render Jael templates from a directory named `views`: ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_jael/angel3_jael.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_jael/protevus_jael.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/jael/angel_jael/example/main.dart b/packages/jael/angel_jael/example/main.dart index de05400a..71aa359a 100644 --- a/packages/jael/angel_jael/example/main.dart +++ b/packages/jael/angel_jael/example/main.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_jael/angel3_jael.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_jael/protevus_jael.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/jael/angel_jael/lib/angel3_jael.dart b/packages/jael/angel_jael/lib/protevus_jael.dart similarity index 98% rename from packages/jael/angel_jael/lib/angel3_jael.dart rename to packages/jael/angel_jael/lib/protevus_jael.dart index 6e32bc2d..0b3d1630 100644 --- a/packages/jael/angel_jael/lib/angel3_jael.dart +++ b/packages/jael/angel_jael/lib/protevus_jael.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:belatuk_code_buffer/belatuk_code_buffer.dart'; import 'package:file/file.dart'; import 'package:jael3/jael3.dart'; diff --git a/packages/jael/angel_jael/pubspec.yaml b/packages/jael/angel_jael/pubspec.yaml index abd73622..0e1b1dfb 100644 --- a/packages/jael/angel_jael/pubspec.yaml +++ b/packages/jael/angel_jael/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_jael +name: protevus_jael version: 8.2.0 description: Protevus support for the Jael templating engine, similar to Blade or Liquid. homepage: https://protevus-framework.web.app/ @@ -6,7 +6,7 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/jael/a environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 jael3: ^8.0.0 jael3_preprocessor: ^8.0.0 belatuk_code_buffer: ^5.1.0 @@ -14,32 +14,32 @@ dependencies: file: ^7.0.0 logging: ^1.2.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 html: ^0.15.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../../http_exception -# angel3_model: +# protevus_model: # path: ../../model -# angel3_route: +# protevus_route: # path: ../../route -# angel3_mock_request: +# protevus_mock_request: # path: ../../mock_request -# angel3_auth: +# protevus_auth: # path: ../../auth -# angel3_client: +# protevus_client: # path: ../../client -# angel3_websocket: +# protevus_websocket: # path: ../../websocket -# angel3_validate: +# protevus_validate: # path: ../../validate -# angel3_test: +# protevus_test: # path: ../../test # jael3: # path: ../jael diff --git a/packages/jael/angel_jael/test/all_test.dart b/packages/jael/angel_jael/test/all_test.dart index 78f6f017..e751f816 100644 --- a/packages/jael/angel_jael/test/all_test.dart +++ b/packages/jael/angel_jael/test/all_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_jael/angel3_jael.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_jael/protevus_jael.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:file/memory.dart'; import 'package:html/parser.dart' as html; import 'package:logging/logging.dart'; diff --git a/packages/jael/angel_jael/test/minified_test.dart b/packages/jael/angel_jael/test/minified_test.dart index 503291f0..1e830245 100644 --- a/packages/jael/angel_jael/test/minified_test.dart +++ b/packages/jael/angel_jael/test/minified_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_jael/angel3_jael.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_jael/protevus_jael.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:file/memory.dart'; import 'package:html/parser.dart' as html; import 'package:jael3/jael3.dart'; diff --git a/packages/jinja/README.md b/packages/jinja/README.md index a79f5d36..90e413ce 100644 --- a/packages/jinja/README.md +++ b/packages/jinja/README.md @@ -1,6 +1,6 @@ # Jinja View Template for Protevus -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_jinja?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_jinja?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/jinja/LICENSE) diff --git a/packages/jinja/example/main.dart b/packages/jinja/example/main.dart index c1a3e902..710fa1de 100644 --- a/packages/jinja/example/main.dart +++ b/packages/jinja/example/main.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_jinja/angel3_jinja.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_jinja/protevus_jinja.dart'; import 'package:path/path.dart' as p; void main() async { diff --git a/packages/jinja/lib/angel3_jinja.dart b/packages/jinja/lib/protevus_jinja.dart similarity index 96% rename from packages/jinja/lib/angel3_jinja.dart rename to packages/jinja/lib/protevus_jinja.dart index 767f6730..7d5bf861 100644 --- a/packages/jinja/lib/angel3_jinja.dart +++ b/packages/jinja/lib/protevus_jinja.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:jinja/jinja.dart'; import 'package:jinja/loaders.dart'; diff --git a/packages/jinja/pubspec.yaml b/packages/jinja/pubspec.yaml index 95ebf4ea..2c536ef6 100644 --- a/packages/jinja/pubspec.yaml +++ b/packages/jinja/pubspec.yaml @@ -1,37 +1,37 @@ -name: angel3_jinja +name: protevus_jinja version: 8.3.1 description: A service that renders Jinja2 template into HTML view for Protevus. Ported from Python to Dart. homepage: https://github.com/dart-backend/protevus/tree/master/packages/jinja environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.4.0 + protevus_framework: ^8.4.0 jinja: ^0.6.0 dev_dependencies: - angel3_test: ^8.2.0 + protevus_test: ^8.2.0 path: ^1.9.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_test: +# protevus_test: # path: ../test -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/markdown/README.md b/packages/markdown/README.md index 5be25c81..b1b11af1 100644 --- a/packages/markdown/README.md +++ b/packages/markdown/README.md @@ -1,6 +1,6 @@ # Protevus Markdown -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_markdown?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_markdown?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/markdown/LICENSE) @@ -15,8 +15,8 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^8.0.0 - angel3_markdown: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_markdown: ^8.0.0 ``` ## Usage @@ -41,12 +41,12 @@ configureServer(Protevus app) async { } ``` -`package:angel3_markdown` by default searches for files with a `.md` extension; however, +`package:protevus_markdown` by default searches for files with a `.md` extension; however, 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`: +`protevus_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}} diff --git a/packages/markdown/example/main.dart b/packages/markdown/example/main.dart index c74ddbb6..10e084d9 100644 --- a/packages/markdown/example/main.dart +++ b/packages/markdown/example/main.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_markdown/angel3_markdown.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_markdown/protevus_markdown.dart'; import 'package:file/local.dart'; void main() async { diff --git a/packages/markdown/lib/angel3_markdown.dart b/packages/markdown/lib/protevus_markdown.dart similarity index 97% rename from packages/markdown/lib/angel3_markdown.dart rename to packages/markdown/lib/protevus_markdown.dart index 02a6f82e..320c6b8b 100644 --- a/packages/markdown/lib/angel3_markdown.dart +++ b/packages/markdown/lib/protevus_markdown.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:mirrors'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/file.dart'; import 'package:markdown/markdown.dart'; diff --git a/packages/markdown/pubspec.yaml b/packages/markdown/pubspec.yaml index 9a08d349..1bc57e03 100644 --- a/packages/markdown/pubspec.yaml +++ b/packages/markdown/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_markdown +name: protevus_markdown version: 8.2.0 description: Protevus Markdown view generator. Write static sites, with no build step. homepage: https://protevus-framework.web.app/ @@ -6,33 +6,33 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/markdo environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 file: ^7.0.0 markdown: ^7.1.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_test: +# protevus_test: # path: ../test -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/mongo/README.md b/packages/mongo/README.md index 98b0da3a..d5237fed 100644 --- a/packages/mongo/README.md +++ b/packages/mongo/README.md @@ -1,6 +1,6 @@ # Protevus Mongo -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_mongo?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_mongo?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/mongo/LICENSE) @@ -13,7 +13,7 @@ Add the following to your `pubspec.yaml`: ```yaml dependencies: - angel3_mongo: ^8.0.0 + protevus_mongo: ^8.0.0 ``` ## Usage diff --git a/packages/mongo/example/example.dart b/packages/mongo/example/example.dart index f7f786df..c1adb9f7 100644 --- a/packages/mongo/example/example.dart +++ b/packages/mongo/example/example.dart @@ -1,6 +1,6 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_mongo/angel3_mongo.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_mongo/protevus_mongo.dart'; import 'package:mongo_dart/mongo_dart.dart'; void main() async { diff --git a/packages/mongo/lib/angel3_mongo.dart b/packages/mongo/lib/protevus_mongo.dart similarity index 51% rename from packages/mongo/lib/angel3_mongo.dart rename to packages/mongo/lib/protevus_mongo.dart index 0b0b620a..d7cb7037 100644 --- a/packages/mongo/lib/angel3_mongo.dart +++ b/packages/mongo/lib/protevus_mongo.dart @@ -1,3 +1,3 @@ -library angel3_mongo; +library protevus_mongo; export 'services.dart'; diff --git a/packages/mongo/lib/services.dart b/packages/mongo/lib/services.dart index 3ae28052..271e8a3a 100644 --- a/packages/mongo/lib/services.dart +++ b/packages/mongo/lib/services.dart @@ -1,7 +1,7 @@ -library angel3_mongo.services; +library protevus_mongo.services; import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:belatuk_merge_map/belatuk_merge_map.dart'; import 'package:mongo_dart/mongo_dart.dart'; diff --git a/packages/mongo/pubspec.yaml b/packages/mongo/pubspec.yaml index e0961faa..ec2227e8 100644 --- a/packages/mongo/pubspec.yaml +++ b/packages/mongo/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_mongo +name: protevus_mongo version: 8.2.1 description: This is MongoDB-enabled service for the Protevus framework. homepage: https://protevus-framework.web.app/ @@ -7,8 +7,8 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.4.0 - angel3_container: ^8.2.0 + protevus_framework: ^8.4.0 + protevus_container: ^8.2.0 belatuk_json_serializer: ^7.1.0 belatuk_merge_map: ^5.1.0 mongo_dart: ^0.10.3 @@ -18,15 +18,15 @@ dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request \ No newline at end of file diff --git a/packages/mongo/test/generic_test.dart b/packages/mongo/test/generic_test.dart index df5fa85b..649944b8 100644 --- a/packages/mongo/test/generic_test.dart +++ b/packages/mongo/test/generic_test.dart @@ -1,7 +1,7 @@ -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_mongo/angel3_mongo.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_mongo/protevus_mongo.dart'; import 'package:http/http.dart' as http; import 'package:belatuk_json_serializer/belatuk_json_serializer.dart' as god; import 'package:mongo_dart/mongo_dart.dart'; diff --git a/packages/mustache/README.md b/packages/mustache/README.md index f7f35732..ed553416 100644 --- a/packages/mustache/README.md +++ b/packages/mustache/README.md @@ -1,6 +1,6 @@ # Mustache View Template for Protevus -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_mustache?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_mustache?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/mustache/LICENSE) @@ -15,7 +15,7 @@ In `pubspec.yaml`: ```yaml dependencies: - angel3_mustache: ^8.0.0 + protevus_mustache: ^8.0.0 ``` ## Usage diff --git a/packages/mustache/example/main.dart b/packages/mustache/example/main.dart index 83460997..78784f0b 100644 --- a/packages/mustache/example/main.dart +++ b/packages/mustache/example/main.dart @@ -1,5 +1,5 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_mustache/angel3_mustache.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_mustache/protevus_mustache.dart'; import 'package:file/file.dart'; import 'package:file/local.dart'; diff --git a/packages/mustache/lib/angel3_mustache.dart b/packages/mustache/lib/protevus_mustache.dart similarity index 93% rename from packages/mustache/lib/angel3_mustache.dart rename to packages/mustache/lib/protevus_mustache.dart index 0d26cede..78a0301a 100644 --- a/packages/mustache/lib/angel3_mustache.dart +++ b/packages/mustache/lib/protevus_mustache.dart @@ -1,8 +1,8 @@ -library angel3_mustache; +library protevus_mustache; import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/file.dart'; import 'package:mustache_template/mustache_template.dart' as viewer; import 'package:path/path.dart' as p; diff --git a/packages/mustache/lib/src/cache.dart b/packages/mustache/lib/src/cache.dart index df598d3d..3345a788 100644 --- a/packages/mustache/lib/src/cache.dart +++ b/packages/mustache/lib/src/cache.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:collection'; import 'package:file/file.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_mustache/src/mustache_context.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_mustache/src/mustache_context.dart'; class MustacheViewCache { /// The context for which views and partials are diff --git a/packages/mustache/pubspec.yaml b/packages/mustache/pubspec.yaml index 884cb936..9f52f424 100644 --- a/packages/mustache/pubspec.yaml +++ b/packages/mustache/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_mustache +name: protevus_mustache version: 8.2.0 description: A service that renders Mustache template into HTML view for Protevus homepage: https://protevus-framework.web.app/ @@ -6,7 +6,7 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/mustac environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 file: ^7.0.0 mustache_template: ^2.0.0 path: ^1.8.0 @@ -15,15 +15,15 @@ dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request \ No newline at end of file diff --git a/packages/mustache/test/all_test.dart b/packages/mustache/test/all_test.dart index 4b99199c..d0af37e3 100644 --- a/packages/mustache/test/all_test.dart +++ b/packages/mustache/test/all_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_mustache/angel3_mustache.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_mustache/protevus_mustache.dart'; import 'package:file/file.dart'; import 'package:file/local.dart'; import 'package:test/test.dart'; diff --git a/packages/oauth2/README.md b/packages/oauth2/README.md index c8a96987..d0b9456b 100644 --- a/packages/oauth2/README.md +++ b/packages/oauth2/README.md @@ -1,6 +1,6 @@ # Protevus OAuth2 Server -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_oauth2?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_oauth2?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/oauth2/LICENSE) @@ -19,8 +19,8 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^8.0.0 - angel3_oauth2: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_oauth2: ^8.0.0 ``` ## Usage @@ -33,7 +33,7 @@ Your server needs to have definitions of at least two types: Define a server class as such: ```dart -import 'package:angel3_oauth2/angel3_oauth2.dart' as oauth2; +import 'package:protevus_oauth2/protevus_oauth2.dart' as oauth2; class MyServer extends oauth2.AuthorizationServer {} ``` diff --git a/packages/oauth2/example/example1.dart b/packages/oauth2/example/example1.dart index 74b2325d..ee731fa9 100644 --- a/packages/oauth2/example/example1.dart +++ b/packages/oauth2/example/example1.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; import 'package:logging/logging.dart'; import '../test/common.dart'; diff --git a/packages/oauth2/example/main.dart b/packages/oauth2/example/main.dart index a8758a9f..9910c179 100644 --- a/packages/oauth2/example/main.dart +++ b/packages/oauth2/example/main.dart @@ -1,7 +1,7 @@ // ignore_for_file: todo import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; void main() async { var app = Protevus(); diff --git a/packages/oauth2/lib/angel3_oauth2.dart b/packages/oauth2/lib/protevus_oauth2.dart similarity index 100% rename from packages/oauth2/lib/angel3_oauth2.dart rename to packages/oauth2/lib/protevus_oauth2.dart diff --git a/packages/oauth2/lib/src/exception.dart b/packages/oauth2/lib/src/exception.dart index f3cf7fb7..48506cdf 100644 --- a/packages/oauth2/lib/src/exception.dart +++ b/packages/oauth2/lib/src/exception.dart @@ -1,4 +1,4 @@ -import 'package:angel3_http_exception/angel3_http_exception.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; /// An Protevus-friendly wrapper around OAuth2 [ErrorResponse] instances. class AuthorizationException extends ProtevusHttpException { diff --git a/packages/oauth2/lib/src/server.dart b/packages/oauth2/lib/src/server.dart index a4fc84a8..fc58933b 100644 --- a/packages/oauth2/lib/src/server.dart +++ b/packages/oauth2/lib/src/server.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:logging/logging.dart'; import 'exception.dart'; import 'pkce.dart'; diff --git a/packages/oauth2/pubspec.yaml b/packages/oauth2/pubspec.yaml index e65b6b34..c306ca69 100644 --- a/packages/oauth2/pubspec.yaml +++ b/packages/oauth2/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_oauth2 +name: protevus_oauth2 version: 8.2.0 description: A class containing handlers that can be used within Protevus to build a spec-compliant OAuth 2.0 server. homepage: https://protevus-framework.web.app/ @@ -6,39 +6,39 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/oauth2 environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 - angel3_http_exception: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_http_exception: ^8.0.0 crypto: ^3.0.1 collection: ^1.17.0 logging: ^1.2.0 dev_dependencies: - angel3_validate: ^8.0.0 - angel3_test: ^8.0.0 - angel3_container: ^8.0.0 + protevus_validate: ^8.0.0 + protevus_test: ^8.0.0 + protevus_container: ^8.0.0 oauth2: ^2.0.0 lints: ^4.0.0 test: ^1.24.0 uuid: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_test: +# protevus_test: # path: ../test -# angel3_validate: +# protevus_validate: # path: ../validate -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth \ No newline at end of file diff --git a/packages/oauth2/test/auth_code_test.dart b/packages/oauth2/test/auth_code_test.dart index ea1850d7..84bba775 100644 --- a/packages/oauth2/test/auth_code_test.dart +++ b/packages/oauth2/test/auth_code_test.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:collection'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:logging/logging.dart'; import 'package:oauth2/oauth2.dart' as oauth2; import 'package:test/test.dart'; diff --git a/packages/oauth2/test/client_credentials_test.dart b/packages/oauth2/test/client_credentials_test.dart index 72808147..d0a22f59 100644 --- a/packages/oauth2/test/client_credentials_test.dart +++ b/packages/oauth2/test/client_credentials_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/oauth2/test/device_code_test.dart b/packages/oauth2/test/device_code_test.dart index c08e0555..fcf71f61 100644 --- a/packages/oauth2/test/device_code_test.dart +++ b/packages/oauth2/test/device_code_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/oauth2/test/implicit_grant_test.dart b/packages/oauth2/test/implicit_grant_test.dart index 4a4ec8ae..65af08de 100644 --- a/packages/oauth2/test/implicit_grant_test.dart +++ b/packages/oauth2/test/implicit_grant_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/oauth2/test/password_test.dart b/packages/oauth2/test/password_test.dart index 6d192006..666fdd44 100644 --- a/packages/oauth2/test/password_test.dart +++ b/packages/oauth2/test/password_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; import 'package:collection/collection.dart' show IterableExtension; import 'package:logging/logging.dart'; import 'package:oauth2/oauth2.dart' as oauth2; diff --git a/packages/oauth2/test/pkce_test.dart b/packages/oauth2/test/pkce_test.dart index 104cf4c2..5973d28b 100644 --- a/packages/oauth2/test/pkce_test.dart +++ b/packages/oauth2/test/pkce_test.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:collection'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_oauth2/angel3_oauth2.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_oauth2/protevus_oauth2.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/orm/README.md b/packages/orm/README.md index fa504e7f..f13fff90 100644 --- a/packages/orm/README.md +++ b/packages/orm/README.md @@ -1,6 +1,6 @@ # Protevus ORM -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/LICENSE) @@ -27,13 +27,13 @@ You'll need these dependencies in your `pubspec.yaml`: ```yaml dependencies: - angel3_orm: ^6.0.0 + protevus_orm: ^6.0.0 dev_dependencies: - angel3_orm_generator: ^6.0.0 + protevus_orm_generator: ^6.0.0 build_runner: ^2.0.0 ``` -`package:angel3_orm_generator` exports a class that you can include in a `package:build` flow: +`package:protevus_orm_generator` exports a class that you can include in a `package:build` flow: - `PostgresOrmGenerator` - Fueled by `package:source_gen`; include this within a `SharedPartBuilder`. @@ -42,15 +42,15 @@ have to do any configuration at all. ## Models -The ORM works best when used with `package:angel3_serialize`: +The ORM works best when used with `package:protevus_serialize`: ```dart library angel_orm.test.models.car; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_model/angel3_model.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_model/protevus_model.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'car.g.dart'; @serializable @@ -70,7 +70,7 @@ abstract class _Car extends Model { abstract class _NoMigrations extends Model {} ``` -Models can use the `@SerializableField()` annotation; `package:angel3_orm` obeys it. +Models can use the `@SerializableField()` annotation; `package:protevus_orm` obeys it. After building, you'll have access to a `Query` class with strongly-typed methods that allow to run asynchronous queries without a headache. @@ -91,8 +91,8 @@ abstract class _ThisIsNotAnAngelModel { MVC just got a whole lot easier: ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'car.dart'; import 'car.orm.g.dart'; @@ -131,7 +131,7 @@ class CarController extends Controller { @Expose('/create', method: 'POST') createCar(QueryExecutor executor) async { - // `package:angel3_orm` generates a strongly-typed `insert` function on the query class. + // `package:protevus_orm` generates a strongly-typed `insert` function on the query class. // Say goodbye to typos!!! var query = CarQuery(); query.values @@ -147,7 +147,7 @@ class CarController extends Controller { ## Relations -`angel3_orm` supports the following relationships: +`protevus_orm` supports the following relationships: - `@HasOne()` (one-to-one) - `@HasMany()` (one-to-many) diff --git a/packages/orm/angel_migration/README.md b/packages/orm/angel_migration/README.md index 1e508a23..f41b1095 100755 --- a/packages/orm/angel_migration/README.md +++ b/packages/orm/angel_migration/README.md @@ -1,11 +1,11 @@ # Protevus Migration -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_migration?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_migration?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_migration/LICENSE) -This package contains the abstract classes for implementing database migration in Protevus framework. It is designed to work with Protevus ORM. Please refer to the implementation in the [ORM Migration Runner]() package for more details. +This package contains the abstract classes for implementing database migration in Protevus framework. It is designed to work with Protevus ORM. Please refer to the implementation in the [ORM Migration Runner]() package for more details. ## Supported Features diff --git a/packages/orm/angel_migration/example/main.dart b/packages/orm/angel_migration/example/main.dart index 3ae5cb49..ce3ad4ab 100644 --- a/packages/orm/angel_migration/example/main.dart +++ b/packages/orm/angel_migration/example/main.dart @@ -1,9 +1,9 @@ /// These are straightforward migrations. /// /// You will likely never have to actually write these yourself. -library angel3_migration.example.todo; +library protevus_migration.example.todo; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; class UserMigration implements Migration { @override diff --git a/packages/orm/angel_migration/lib/angel3_migration.dart b/packages/orm/angel_migration/lib/protevus_migration.dart similarity index 100% rename from packages/orm/angel_migration/lib/angel3_migration.dart rename to packages/orm/angel_migration/lib/protevus_migration.dart diff --git a/packages/orm/angel_migration/lib/src/column.dart b/packages/orm/angel_migration/lib/src/column.dart index f98aebb5..c9f3dfa5 100755 --- a/packages/orm/angel_migration/lib/src/column.dart +++ b/packages/orm/angel_migration/lib/src/column.dart @@ -1,4 +1,4 @@ -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; class MigrationColumn extends Column { final List _references = []; diff --git a/packages/orm/angel_migration/lib/src/table.dart b/packages/orm/angel_migration/lib/src/table.dart index d1db17e6..be1dc9e8 100755 --- a/packages/orm/angel_migration/lib/src/table.dart +++ b/packages/orm/angel_migration/lib/src/table.dart @@ -1,4 +1,4 @@ -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'column.dart'; diff --git a/packages/orm/angel_migration/pubspec.yaml b/packages/orm/angel_migration/pubspec.yaml index 0e8d21ec..7ce0cbf0 100755 --- a/packages/orm/angel_migration/pubspec.yaml +++ b/packages/orm/angel_migration/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_migration +name: protevus_migration version: 8.3.0 description: The abstract classes for implementing database migration in Protevus framework. Designed to work with Protevus ORM. homepage: https://protevus-framework.web.app/ @@ -6,9 +6,9 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_orm: ^8.0.0 + protevus_orm: ^8.0.0 dev_dependencies: lints: ^4.0.0 # dependency_overrides: -# angel3_orm: +# protevus_orm: # path: ../angel_orm diff --git a/packages/orm/angel_migration_runner/README.md b/packages/orm/angel_migration_runner/README.md index fe0ac105..9ecb4e00 100755 --- a/packages/orm/angel_migration_runner/README.md +++ b/packages/orm/angel_migration_runner/README.md @@ -1,6 +1,6 @@ # Protevus Migration Runner -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_migration_runner?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_migration_runner?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_migration_runner/LICENSE) diff --git a/packages/orm/angel_migration_runner/example/main.dart b/packages/orm/angel_migration_runner/example/main.dart index 61ff0cd7..e168953a 100755 --- a/packages/orm/angel_migration_runner/example/main.dart +++ b/packages/orm/angel_migration_runner/example/main.dart @@ -1,10 +1,10 @@ import 'dart:io'; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_migration_runner/angel3_migration_runner.dart'; -import 'package:angel3_migration_runner/mysql.dart'; -import 'package:angel3_migration_runner/postgres.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_migration_runner/protevus_migration_runner.dart'; +import 'package:protevus_migration_runner/mysql.dart'; +import 'package:protevus_migration_runner/postgres.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:mysql_client/mysql_client.dart'; import 'package:postgres/postgres.dart'; diff --git a/packages/orm/angel_migration_runner/example/todo.dart b/packages/orm/angel_migration_runner/example/todo.dart index af112445..ebd70e3f 100644 --- a/packages/orm/angel_migration_runner/example/todo.dart +++ b/packages/orm/angel_migration_runner/example/todo.dart @@ -1,4 +1,4 @@ -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; class UserMigration implements Migration { @override diff --git a/packages/orm/angel_migration_runner/lib/angel3_migration_runner.dart b/packages/orm/angel_migration_runner/lib/protevus_migration_runner.dart similarity index 100% rename from packages/orm/angel_migration_runner/lib/angel3_migration_runner.dart rename to packages/orm/angel_migration_runner/lib/protevus_migration_runner.dart diff --git a/packages/orm/angel_migration_runner/lib/src/mariadb/runner.dart b/packages/orm/angel_migration_runner/lib/src/mariadb/runner.dart index ce8a255b..bb07d5ba 100644 --- a/packages/orm/angel_migration_runner/lib/src/mariadb/runner.dart +++ b/packages/orm/angel_migration_runner/lib/src/mariadb/runner.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:collection'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:logging/logging.dart'; import 'package:mysql1/mysql1.dart'; import '../runner.dart'; diff --git a/packages/orm/angel_migration_runner/lib/src/mariadb/schema.dart b/packages/orm/angel_migration_runner/lib/src/mariadb/schema.dart index a9106288..626c726e 100644 --- a/packages/orm/angel_migration_runner/lib/src/mariadb/schema.dart +++ b/packages/orm/angel_migration_runner/lib/src/mariadb/schema.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:logging/logging.dart'; import 'package:mysql1/mysql1.dart'; diff --git a/packages/orm/angel_migration_runner/lib/src/mariadb/table.dart b/packages/orm/angel_migration_runner/lib/src/mariadb/table.dart index ab18b079..4e09dadc 100644 --- a/packages/orm/angel_migration_runner/lib/src/mariadb/table.dart +++ b/packages/orm/angel_migration_runner/lib/src/mariadb/table.dart @@ -1,7 +1,7 @@ import 'dart:collection'; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:charcode/ascii.dart'; abstract class MariaDbGenerator { @@ -257,7 +257,7 @@ class MariaDbIndexes implements MutableIndexes { case IndexType.unique: _stack.add( 'CREATE UNIQUE INDEX IF NOT EXISTS `$name` ' - 'ON `$tableName` (${columns.join(',')});', + 'ON `$tableName` (${columns.join(',')});', ); break; case IndexType.standardIndex: diff --git a/packages/orm/angel_migration_runner/lib/src/mysql/runner.dart b/packages/orm/angel_migration_runner/lib/src/mysql/runner.dart index ab2020c2..8cc8224f 100644 --- a/packages/orm/angel_migration_runner/lib/src/mysql/runner.dart +++ b/packages/orm/angel_migration_runner/lib/src/mysql/runner.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:collection'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:logging/logging.dart'; import 'package:mysql_client/mysql_client.dart'; import '../runner.dart'; diff --git a/packages/orm/angel_migration_runner/lib/src/mysql/schema.dart b/packages/orm/angel_migration_runner/lib/src/mysql/schema.dart index 44a276fc..35c13546 100644 --- a/packages/orm/angel_migration_runner/lib/src/mysql/schema.dart +++ b/packages/orm/angel_migration_runner/lib/src/mysql/schema.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:logging/logging.dart'; import 'package:mysql_client/mysql_client.dart'; diff --git a/packages/orm/angel_migration_runner/lib/src/mysql/table.dart b/packages/orm/angel_migration_runner/lib/src/mysql/table.dart index 3f4ad673..4956e7c3 100644 --- a/packages/orm/angel_migration_runner/lib/src/mysql/table.dart +++ b/packages/orm/angel_migration_runner/lib/src/mysql/table.dart @@ -1,7 +1,7 @@ import 'dart:collection'; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:charcode/ascii.dart'; abstract class MySqlGenerator { diff --git a/packages/orm/angel_migration_runner/lib/src/postgres/runner.dart b/packages/orm/angel_migration_runner/lib/src/postgres/runner.dart index 05a6344e..10cedb95 100755 --- a/packages/orm/angel_migration_runner/lib/src/postgres/runner.dart +++ b/packages/orm/angel_migration_runner/lib/src/postgres/runner.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:collection'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:postgres/postgres.dart'; import 'package:logging/logging.dart'; import '../runner.dart'; diff --git a/packages/orm/angel_migration_runner/lib/src/postgres/schema.dart b/packages/orm/angel_migration_runner/lib/src/postgres/schema.dart index 9258ceae..a47b8ed3 100755 --- a/packages/orm/angel_migration_runner/lib/src/postgres/schema.dart +++ b/packages/orm/angel_migration_runner/lib/src/postgres/schema.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:logging/logging.dart'; import 'package:postgres/postgres.dart'; diff --git a/packages/orm/angel_migration_runner/lib/src/postgres/table.dart b/packages/orm/angel_migration_runner/lib/src/postgres/table.dart index 83d5e977..a00ac5a2 100755 --- a/packages/orm/angel_migration_runner/lib/src/postgres/table.dart +++ b/packages/orm/angel_migration_runner/lib/src/postgres/table.dart @@ -1,7 +1,7 @@ import 'dart:collection'; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:charcode/ascii.dart'; abstract class PostgresGenerator { diff --git a/packages/orm/angel_migration_runner/lib/src/runner.dart b/packages/orm/angel_migration_runner/lib/src/runner.dart index b3970260..d68d82b8 100755 --- a/packages/orm/angel_migration_runner/lib/src/runner.dart +++ b/packages/orm/angel_migration_runner/lib/src/runner.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_migration/protevus_migration.dart'; abstract class MigrationRunner { void addMigration(Migration migration); diff --git a/packages/orm/angel_migration_runner/pubspec.yaml b/packages/orm/angel_migration_runner/pubspec.yaml index e13db552..8a13abec 100755 --- a/packages/orm/angel_migration_runner/pubspec.yaml +++ b/packages/orm/angel_migration_runner/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_migration_runner +name: protevus_migration_runner version: 8.3.0 description: The implementation of database migration for Protevus framework. Designed to work with Protevus ORM. homepage: https://protevus-framework.web.app/ @@ -6,8 +6,8 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_migration: ^8.3.0 - angel3_orm: ^8.2.0 + protevus_migration: ^8.3.0 + protevus_orm: ^8.2.0 args: ^2.4.0 charcode: ^1.3.0 postgres: ^3.0.0 @@ -18,7 +18,7 @@ dev_dependencies: lints: ^4.0.0 test: ^1.25.0 # dependency_overrides: -# angel3_orm: +# protevus_orm: # path: ../angel_orm -# angel3_migration: +# protevus_migration: # path: ../angel_migration diff --git a/packages/orm/angel_migration_runner/test/mariadb_test.dart b/packages/orm/angel_migration_runner/test/mariadb_test.dart index 9e6330f0..efd73fbd 100644 --- a/packages/orm/angel_migration_runner/test/mariadb_test.dart +++ b/packages/orm/angel_migration_runner/test/mariadb_test.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_migration_runner/angel3_migration_runner.dart'; -import 'package:angel3_migration_runner/mariadb.dart'; +import 'package:protevus_migration_runner/protevus_migration_runner.dart'; +import 'package:protevus_migration_runner/mariadb.dart'; import 'package:mysql1/mysql1.dart'; import 'package:test/test.dart'; diff --git a/packages/orm/angel_migration_runner/test/models/mysql_todo.dart b/packages/orm/angel_migration_runner/test/models/mysql_todo.dart index 178aef4b..4c6baa81 100644 --- a/packages/orm/angel_migration_runner/test/models/mysql_todo.dart +++ b/packages/orm/angel_migration_runner/test/models/mysql_todo.dart @@ -1,5 +1,5 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; class UserMigration implements Migration { @override diff --git a/packages/orm/angel_migration_runner/test/models/pg_todo.dart b/packages/orm/angel_migration_runner/test/models/pg_todo.dart index 42304920..08b831e5 100644 --- a/packages/orm/angel_migration_runner/test/models/pg_todo.dart +++ b/packages/orm/angel_migration_runner/test/models/pg_todo.dart @@ -1,5 +1,5 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; class UserMigration implements Migration { @override diff --git a/packages/orm/angel_migration_runner/test/mysql_test.dart b/packages/orm/angel_migration_runner/test/mysql_test.dart index ff062397..fb362fc6 100644 --- a/packages/orm/angel_migration_runner/test/mysql_test.dart +++ b/packages/orm/angel_migration_runner/test/mysql_test.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_migration_runner/angel3_migration_runner.dart'; -import 'package:angel3_migration_runner/mysql.dart'; +import 'package:protevus_migration_runner/protevus_migration_runner.dart'; +import 'package:protevus_migration_runner/mysql.dart'; import 'package:mysql_client/mysql_client.dart'; import 'package:test/test.dart'; diff --git a/packages/orm/angel_migration_runner/test/pg_test.dart b/packages/orm/angel_migration_runner/test/pg_test.dart index 8075bcf3..ea176fc6 100644 --- a/packages/orm/angel_migration_runner/test/pg_test.dart +++ b/packages/orm/angel_migration_runner/test/pg_test.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_migration_runner/angel3_migration_runner.dart'; -import 'package:angel3_migration_runner/postgres.dart'; +import 'package:protevus_migration_runner/protevus_migration_runner.dart'; +import 'package:protevus_migration_runner/postgres.dart'; import 'package:postgres/postgres.dart'; import 'package:test/test.dart'; diff --git a/packages/orm/angel_orm/README.md b/packages/orm/angel_orm/README.md index 15c6f6af..875a622d 100644 --- a/packages/orm/angel_orm/README.md +++ b/packages/orm/angel_orm/README.md @@ -1,6 +1,6 @@ # Protevus ORM -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_orm/LICENSE) diff --git a/packages/orm/angel_orm/example/main.dart b/packages/orm/angel_orm/example/main.dart index 470e87f1..42f7e9e6 100644 --- a/packages/orm/angel_orm/example/main.dart +++ b/packages/orm/angel_orm/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'main.g.dart'; diff --git a/packages/orm/angel_orm/lib/angel3_orm.dart b/packages/orm/angel_orm/lib/protevus_orm.dart similarity index 100% rename from packages/orm/angel_orm/lib/angel3_orm.dart rename to packages/orm/angel_orm/lib/protevus_orm.dart diff --git a/packages/orm/angel_orm/lib/src/query.dart b/packages/orm/angel_orm/lib/src/query.dart index b8145d0f..25d6d4f9 100644 --- a/packages/orm/angel_orm/lib/src/query.dart +++ b/packages/orm/angel_orm/lib/src/query.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:logging/logging.dart'; import 'package:optional/optional.dart'; diff --git a/packages/orm/angel_orm/lib/src/query_executor.dart b/packages/orm/angel_orm/lib/src/query_executor.dart index 1cd95d2c..925d7908 100644 --- a/packages/orm/angel_orm/lib/src/query_executor.dart +++ b/packages/orm/angel_orm/lib/src/query_executor.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import '../angel3_orm.dart'; +import '../protevus_orm.dart'; /// An abstract interface that performs queries. /// diff --git a/packages/orm/angel_orm/pubspec.yaml b/packages/orm/angel_orm/pubspec.yaml index ad44b33b..f99e6c71 100644 --- a/packages/orm/angel_orm/pubspec.yaml +++ b/packages/orm/angel_orm/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_orm +name: protevus_orm version: 8.2.0 description: Runtime support for Protevus ORM. Includes base classes for queries. homepage: https://protevus-framework.web.app/ @@ -13,16 +13,16 @@ dependencies: optional: ^6.1.0 logging: ^1.2.0 dev_dependencies: - angel3_model: ^8.2.0 - angel3_serialize: ^8.0.0 - angel3_serialize_generator: ^8.0.0 + protevus_model: ^8.2.0 + protevus_serialize: ^8.0.0 + protevus_serialize_generator: ^8.0.0 build_runner: ^2.4.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_serialize: +# protevus_serialize: # path: ../../serialize/angel_serialize -# angel3_serialize_generator: +# protevus_serialize_generator: # path: ../../serialize/angel_serialize_generator -# angel3_model: +# protevus_model: # path: ../../model \ No newline at end of file diff --git a/packages/orm/angel_orm_generator/README.md b/packages/orm/angel_orm_generator/README.md index 0ddf8afd..31525a12 100644 --- a/packages/orm/angel_orm_generator/README.md +++ b/packages/orm/angel_orm_generator/README.md @@ -1,9 +1,9 @@ # Protevus ORM Generator -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm_generator?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm_generator?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) -[![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel3_orm_generator/LICENSE) +[![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/protevus_orm_generator/LICENSE) Source code generators for Protevus ORM. This package can generate: diff --git a/packages/orm/angel_orm_generator/build.yaml b/packages/orm/angel_orm_generator/build.yaml index f932c406..10677139 100644 --- a/packages/orm/angel_orm_generator/build.yaml +++ b/packages/orm/angel_orm_generator/build.yaml @@ -1,6 +1,6 @@ builders: - angel3_orm: - import: "package:angel3_orm_generator/angel3_orm_generator.dart" + protevus_orm: + import: "package:protevus_orm_generator/protevus_orm_generator.dart" builder_factories: - migrationBuilder - ormBuilder @@ -8,12 +8,12 @@ builders: build_to: cache build_extensions: .dart: - - ".angel3_migration.g.part" - - ".angel3_orm.g.part" + - ".protevus_migration.g.part" + - ".protevus_orm.g.part" required_inputs: - - angel3_serialize.g.part - - angel3_serialize_serializer.g.part + - protevus_serialize.g.part + - protevus_serialize_serializer.g.part applies_builders: - - angel3_serialize_generator|angel3_serialize + - protevus_serialize_generator|protevus_serialize - source_gen|combining_builder - source_gen|part_cleanup" \ No newline at end of file diff --git a/packages/orm/angel_orm_generator/example/main.dart b/packages/orm/angel_orm_generator/example/main.dart index cc2e1b7e..5db5ef55 100644 --- a/packages/orm/angel_orm_generator/example/main.dart +++ b/packages/orm/angel_orm_generator/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'main.g.dart'; diff --git a/packages/orm/angel_orm_generator/lib/angel3_orm_generator.dart b/packages/orm/angel_orm_generator/lib/protevus_orm_generator.dart similarity index 100% rename from packages/orm/angel_orm_generator/lib/angel3_orm_generator.dart rename to packages/orm/angel_orm_generator/lib/protevus_orm_generator.dart diff --git a/packages/orm/angel_orm_generator/lib/src/migration_generator.dart b/packages/orm/angel_orm_generator/lib/src/migration_generator.dart index 843b0301..44d5ba4c 100644 --- a/packages/orm/angel_orm_generator/lib/src/migration_generator.dart +++ b/packages/orm/angel_orm_generator/lib/src/migration_generator.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_model/angel3_model.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize_generator/angel3_serialize_generator.dart'; +import 'package:protevus_model/protevus_model.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize_generator/protevus_serialize_generator.dart'; import 'package:build/build.dart'; import 'package:code_builder/code_builder.dart'; import 'package:dart_style/dart_style.dart'; @@ -16,7 +16,7 @@ Builder migrationBuilder(BuilderOptions options) { return SharedPartBuilder([ MigrationGenerator( autoSnakeCaseNames: options.config['auto_snake_case_names'] != false) - ], 'angel3_migration'); + ], 'protevus_migration'); } /// Generates `Migration.dart` from an abstract `Model` class. diff --git a/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart b/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart index f2c6299e..23b1ec8b 100644 --- a/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart +++ b/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart @@ -3,11 +3,11 @@ import 'dart:async'; import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_serialize_generator/angel3_serialize_generator.dart'; -import 'package:angel3_serialize_generator/build_context.dart'; -import 'package:angel3_serialize_generator/context.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_serialize_generator/protevus_serialize_generator.dart'; +import 'package:protevus_serialize_generator/build_context.dart'; +import 'package:protevus_serialize_generator/context.dart'; import 'package:build/build.dart'; import 'package:inflection3/inflection3.dart'; import 'package:recase/recase.dart'; diff --git a/packages/orm/angel_orm_generator/lib/src/orm_generator.dart b/packages/orm/angel_orm_generator/lib/src/orm_generator.dart index 7054ed36..63b6c256 100644 --- a/packages/orm/angel_orm_generator/lib/src/orm_generator.dart +++ b/packages/orm/angel_orm_generator/lib/src/orm_generator.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_serialize_generator/angel3_serialize_generator.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_serialize_generator/protevus_serialize_generator.dart'; import 'package:build/build.dart'; import 'package:code_builder/code_builder.dart' hide LibraryBuilder; import 'package:source_gen/source_gen.dart'; @@ -23,7 +23,7 @@ Builder ormBuilder(BuilderOptions options) { return SharedPartBuilder([ OrmGenerator( autoSnakeCaseNames: options.config['auto_snake_case_names'] != false) - ], 'angel3_orm'); + ], 'protevus_orm'); } TypeReference futureOf(String type) { diff --git a/packages/orm/angel_orm_generator/lib/src/readers.dart b/packages/orm/angel_orm_generator/lib/src/readers.dart index 9964d4fd..b09091a4 100644 --- a/packages/orm/angel_orm_generator/lib/src/readers.dart +++ b/packages/orm/angel_orm_generator/lib/src/readers.dart @@ -1,7 +1,7 @@ import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:source_gen/source_gen.dart'; import 'orm_build_context.dart'; diff --git a/packages/orm/angel_orm_generator/pubspec.yaml b/packages/orm/angel_orm_generator/pubspec.yaml index 963ed237..b6740f4a 100644 --- a/packages/orm/angel_orm_generator/pubspec.yaml +++ b/packages/orm/angel_orm_generator/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_orm_generator +name: protevus_orm_generator version: 8.3.2 description: Code generators for Protevus ORM. Generates query builder classes. homepage: https://protevus-framework.web.app/ @@ -6,10 +6,10 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_model: ^8.2.0 - angel3_serialize: ^8.2.0 - angel3_orm: ^8.0.0 - angel3_serialize_generator: ^8.3.0 + protevus_model: ^8.2.0 + protevus_serialize: ^8.2.0 + protevus_orm: ^8.0.0 + protevus_serialize_generator: ^8.3.0 analyzer: ^6.5.0 inflection3: ^0.5.3+2 build: ^2.4.0 @@ -24,30 +24,30 @@ dependencies: logging: ^1.2.0 optional: ^6.0.0 dev_dependencies: - angel3_framework: ^8.4.0 - angel3_migration: ^8.2.0 + protevus_framework: ^8.4.0 + protevus_migration: ^8.2.0 build_runner: ^2.4.0 test: ^1.24.0 lints: ^4.0.0 #dependency_overrides: -# angel3_container: +# protevus_container: # path: ../../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../../http_exception -# angel3_model: +# protevus_model: # path: ../../model -# angel3_route: +# protevus_route: # path: ../../route -# angel3_mock_request: +# protevus_mock_request: # path: ../../mock_request -# angel3_serialize: +# protevus_serialize: # path: ../../serialize/angel_serialize -# angel3_serialize_generator: +# protevus_serialize_generator: # path: ../../serialize/angel_serialize_generator -# angel3_orm: +# protevus_orm: # path: ../angel_orm -# angel3_migration: +# protevus_migration: # path: ../angel_migration \ No newline at end of file diff --git a/packages/orm/angel_orm_mysql/README.md b/packages/orm/angel_orm_mysql/README.md index c631ef6e..c34c1b8d 100644 --- a/packages/orm/angel_orm_mysql/README.md +++ b/packages/orm/angel_orm_mysql/README.md @@ -1,6 +1,6 @@ # Protevus ORM for MySQL -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm_mysql?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm_mysql?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_orm_mysql/LICENSE) diff --git a/packages/orm/angel_orm_mysql/example/main.dart b/packages/orm/angel_orm_mysql/example/main.dart index 58f16e3e..6038fac5 100644 --- a/packages/orm/angel_orm_mysql/example/main.dart +++ b/packages/orm/angel_orm_mysql/example/main.dart @@ -1,9 +1,9 @@ import 'dart:io'; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_orm_mysql/angel3_orm_mysql.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_orm_mysql/protevus_orm_mysql.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:mysql_client/mysql_client.dart'; import 'package:mysql1/mysql1.dart'; import 'package:logging/logging.dart'; diff --git a/packages/orm/angel_orm_mysql/lib/angel3_orm_mysql.dart b/packages/orm/angel_orm_mysql/lib/protevus_orm_mysql.dart similarity index 100% rename from packages/orm/angel_orm_mysql/lib/angel3_orm_mysql.dart rename to packages/orm/angel_orm_mysql/lib/protevus_orm_mysql.dart diff --git a/packages/orm/angel_orm_mysql/lib/src/orm_mariadb.dart b/packages/orm/angel_orm_mysql/lib/src/orm_mariadb.dart index 55fe515c..0c11868d 100644 --- a/packages/orm/angel_orm_mysql/lib/src/orm_mariadb.dart +++ b/packages/orm/angel_orm_mysql/lib/src/orm_mariadb.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:logging/logging.dart'; import 'package:mysql1/mysql1.dart'; diff --git a/packages/orm/angel_orm_mysql/lib/src/orm_mysql.dart b/packages/orm/angel_orm_mysql/lib/src/orm_mysql.dart index 07129448..0bdb7127 100644 --- a/packages/orm/angel_orm_mysql/lib/src/orm_mysql.dart +++ b/packages/orm/angel_orm_mysql/lib/src/orm_mysql.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:logging/logging.dart'; import 'package:mysql_client/mysql_client.dart'; diff --git a/packages/orm/angel_orm_mysql/pubspec.yaml b/packages/orm/angel_orm_mysql/pubspec.yaml index 28d43637..c31393c8 100644 --- a/packages/orm/angel_orm_mysql/pubspec.yaml +++ b/packages/orm/angel_orm_mysql/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_orm_mysql +name: protevus_orm_mysql version: 8.2.0 description: MySQL support for Protevus ORM. Includes functionality for querying and transactions. homepage: https://protevus-framework.web.app/ @@ -6,30 +6,30 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_orm: ^8.0.0 + protevus_orm: ^8.0.0 logging: ^1.2.0 mysql1: ^0.20.0 mysql_client: ^0.0.27 optional: ^6.1.0 dev_dependencies: - angel3_orm_generator: ^8.0.0 - angel3_orm_test: ^8.0.0 + protevus_orm_generator: ^8.0.0 + protevus_orm_test: ^8.0.0 build_runner: ^2.4.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_serialize: +# protevus_serialize: # path: ../../serialize/angel_serialize -# angel3_serialize_generator: +# protevus_serialize_generator: # path: ../../serialize/angel_serialize_generator -# angel3_model: +# protevus_model: # path: ../../model -# angel3_orm_test: +# protevus_orm_test: # path: ../angel_orm_test -# angel3_orm: +# protevus_orm: # path: ../angel_orm -# angel3_orm_generator: +# protevus_orm_generator: # path: ../angel_orm_generator -# angel3_migration: +# protevus_migration: # path: ../angel_migration diff --git a/packages/orm/angel_orm_mysql/test/all_test.dart b/packages/orm/angel_orm_mysql/test/all_test.dart index 14b9fcdb..5c9df2f5 100644 --- a/packages/orm/angel_orm_mysql/test/all_test.dart +++ b/packages/orm/angel_orm_mysql/test/all_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_orm_test/angel3_orm_test.dart'; +import 'package:protevus_orm_test/protevus_orm_test.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; import 'common.dart'; diff --git a/packages/orm/angel_orm_mysql/test/common.dart b/packages/orm/angel_orm_mysql/test/common.dart index 7801de31..64a84690 100644 --- a/packages/orm/angel_orm_mysql/test/common.dart +++ b/packages/orm/angel_orm_mysql/test/common.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_orm_mysql/angel3_orm_mysql.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_orm_mysql/protevus_orm_mysql.dart'; import 'package:logging/logging.dart'; //import 'package:mysql1/mysql1.dart'; import 'package:mysql_client/mysql_client.dart'; diff --git a/packages/orm/angel_orm_postgres/README.md b/packages/orm/angel_orm_postgres/README.md index b53f5775..27663043 100644 --- a/packages/orm/angel_orm_postgres/README.md +++ b/packages/orm/angel_orm_postgres/README.md @@ -1,6 +1,6 @@ # Protevus ORM for PostgreSQL -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm_postgres?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm_postgres?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_orm_postgres/LICENSE) diff --git a/packages/orm/angel_orm_postgres/example/main.dart b/packages/orm/angel_orm_postgres/example/main.dart index 8fc33fc0..86210446 100644 --- a/packages/orm/angel_orm_postgres/example/main.dart +++ b/packages/orm/angel_orm_postgres/example/main.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:angel3_orm_postgres/angel3_orm_postgres.dart'; +import 'package:protevus_orm_postgres/protevus_orm_postgres.dart'; import 'package:postgres/postgres.dart'; void main() async { diff --git a/packages/orm/angel_orm_postgres/lib/angel3_orm_postgres.dart b/packages/orm/angel_orm_postgres/lib/protevus_orm_postgres.dart similarity index 100% rename from packages/orm/angel_orm_postgres/lib/angel3_orm_postgres.dart rename to packages/orm/angel_orm_postgres/lib/protevus_orm_postgres.dart diff --git a/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart b/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart index 60480b4f..27864d65 100644 --- a/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart +++ b/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:logging/logging.dart'; import 'package:postgres/postgres.dart'; diff --git a/packages/orm/angel_orm_postgres/lib/src/orm_postgres_pool.dart b/packages/orm/angel_orm_postgres/lib/src/orm_postgres_pool.dart index 7befeb5b..f36883f0 100644 --- a/packages/orm/angel_orm_postgres/lib/src/orm_postgres_pool.dart +++ b/packages/orm/angel_orm_postgres/lib/src/orm_postgres_pool.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:logging/logging.dart'; import 'package:postgres/postgres.dart'; -import '../angel3_orm_postgres.dart'; +import '../protevus_orm_postgres.dart'; /// A [QueryExecutor] that uses `package:postgres_pool` for connetions pooling. class PostgreSqlPoolExecutor extends QueryExecutor { diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml index 908b2331..1bcfc347 100644 --- a/packages/orm/angel_orm_postgres/pubspec.yaml +++ b/packages/orm/angel_orm_postgres/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_orm_postgres +name: protevus_orm_postgres version: 8.2.2 description: PostgreSQL support for Protevus ORM. Includes functionality for querying and transactions. homepage: https://protevus-framework.web.app/ @@ -6,28 +6,28 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_orm: ^8.2.0 + protevus_orm: ^8.2.0 logging: ^1.2.0 pool: ^1.5.0 postgres: ^3.2.0 dev_dependencies: belatuk_pretty_logging: ^6.1.0 - angel3_orm_generator: ^8.2.0 - angel3_orm_test: ^8.2.0 + protevus_orm_generator: ^8.2.0 + protevus_orm_test: ^8.2.0 test: ^1.24.0 lints: ^4.0.0 #dependency_overrides: -# angel3_serialize: +# protevus_serialize: # path: ../../serialize/angel_serialize -# angel3_serialize_generator: +# protevus_serialize_generator: # path: ../../serialize/angel_serialize_generator -# angel3_model: +# protevus_model: # path: ../../model -# angel3_orm_test: +# protevus_orm_test: # path: ../angel_orm_test -# angel3_orm_generator: +# protevus_orm_generator: # path: ../angel_orm_generator -# angel3_orm: +# protevus_orm: # path: ../angel_orm -# angel3_migration: +# protevus_migration: # path: ../angel_migration diff --git a/packages/orm/angel_orm_postgres/test/all_test.dart b/packages/orm/angel_orm_postgres/test/all_test.dart index 4d7b7374..4499265e 100644 --- a/packages/orm/angel_orm_postgres/test/all_test.dart +++ b/packages/orm/angel_orm_postgres/test/all_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_orm_test/angel3_orm_test.dart'; +import 'package:protevus_orm_test/protevus_orm_test.dart'; import 'package:logging/logging.dart'; import 'package:belatuk_pretty_logging/belatuk_pretty_logging.dart'; import 'package:test/test.dart'; diff --git a/packages/orm/angel_orm_postgres/test/common.dart b/packages/orm/angel_orm_postgres/test/common.dart index 0b04bcd7..a0ade1a2 100644 --- a/packages/orm/angel_orm_postgres/test/common.dart +++ b/packages/orm/angel_orm_postgres/test/common.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_orm_postgres/angel3_orm_postgres.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_orm_postgres/protevus_orm_postgres.dart'; import 'package:logging/logging.dart'; import 'package:postgres/postgres.dart'; diff --git a/packages/orm/angel_orm_postgres/test/orm_debug.dart b/packages/orm/angel_orm_postgres/test/orm_debug.dart index eac9395f..e89d7814 100644 --- a/packages/orm/angel_orm_postgres/test/orm_debug.dart +++ b/packages/orm/angel_orm_postgres/test/orm_debug.dart @@ -1,4 +1,4 @@ -import 'package:angel3_orm_test/angel3_orm_test.dart'; +import 'package:protevus_orm_test/protevus_orm_test.dart'; import 'package:logging/logging.dart'; import 'common.dart'; diff --git a/packages/orm/angel_orm_service/README.md b/packages/orm/angel_orm_service/README.md index d2741132..1f71003d 100644 --- a/packages/orm/angel_orm_service/README.md +++ b/packages/orm/angel_orm_service/README.md @@ -1,6 +1,6 @@ # Protevus ORM Service -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm_service?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm_service?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_orm_service/LICENSE) @@ -13,7 +13,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_orm_service: ^8.0.0 + protevus_orm_service: ^8.0.0 ``` ## Usage diff --git a/packages/orm/angel_orm_service/example/connect.dart b/packages/orm/angel_orm_service/example/connect.dart index abe59baf..bb8de4d7 100644 --- a/packages/orm/angel_orm_service/example/connect.dart +++ b/packages/orm/angel_orm_service/example/connect.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_orm_postgres/angel3_orm_postgres.dart'; +import 'package:protevus_orm_postgres/protevus_orm_postgres.dart'; import 'package:postgres/postgres.dart'; Future dbConnection() async { diff --git a/packages/orm/angel_orm_service/example/main.dart b/packages/orm/angel_orm_service/example/main.dart index 3d8dfa5d..07c7a47e 100644 --- a/packages/orm/angel_orm_service/example/main.dart +++ b/packages/orm/angel_orm_service/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_orm_service/angel3_orm_service.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_orm_service/protevus_orm_service.dart'; import 'package:logging/logging.dart'; import 'connect.dart'; import 'todo.dart'; diff --git a/packages/orm/angel_orm_service/example/migrate.dart b/packages/orm/angel_orm_service/example/migrate.dart index ba7ee8a0..0fbd3ff0 100644 --- a/packages/orm/angel_orm_service/example/migrate.dart +++ b/packages/orm/angel_orm_service/example/migrate.dart @@ -1,5 +1,5 @@ -import 'package:angel3_migration_runner/angel3_migration_runner.dart'; -import 'package:angel3_migration_runner/postgres.dart'; +import 'package:protevus_migration_runner/protevus_migration_runner.dart'; +import 'package:protevus_migration_runner/postgres.dart'; import 'connect.dart'; import 'todo.dart'; diff --git a/packages/orm/angel_orm_service/example/todo.dart b/packages/orm/angel_orm_service/example/todo.dart index f38c082f..215c4117 100644 --- a/packages/orm/angel_orm_service/example/todo.dart +++ b/packages/orm/angel_orm_service/example/todo.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:optional/optional.dart'; part 'todo.g.dart'; diff --git a/packages/orm/angel_orm_service/lib/angel3_orm_service.dart b/packages/orm/angel_orm_service/lib/protevus_orm_service.dart similarity index 98% rename from packages/orm/angel_orm_service/lib/angel3_orm_service.dart rename to packages/orm/angel_orm_service/lib/protevus_orm_service.dart index 3765adfa..48d28da2 100644 --- a/packages/orm/angel_orm_service/lib/angel3_orm_service.dart +++ b/packages/orm/angel_orm_service/lib/protevus_orm_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart' hide Query; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_framework/protevus_framework.dart' hide Query; +import 'package:protevus_orm/protevus_orm.dart'; /// A [Service] implementation that wraps over a [Query] class generated /// via the Protevus ORM. diff --git a/packages/orm/angel_orm_service/pubspec.yaml b/packages/orm/angel_orm_service/pubspec.yaml index 49a1f91e..cfbb436f 100644 --- a/packages/orm/angel_orm_service/pubspec.yaml +++ b/packages/orm/angel_orm_service/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_orm_service +name: protevus_orm_service version: 8.2.2 description: Service implementation that wraps over Protevus ORM Query classes. homepage: https://protevus-framework.web.app/ @@ -6,46 +6,46 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.4.0 - angel3_orm: ^8.2.0 + protevus_framework: ^8.4.0 + protevus_orm: ^8.2.0 postgres: ^3.2.0 optional: ^6.0.0 dev_dependencies: - angel3_migration: ^8.2.0 - angel3_migration_runner: ^8.2.0 - angel3_orm_generator: ^8.2.0 - angel3_orm_postgres: ^8.2.0 - angel3_serialize: ^8.2.0 + protevus_migration: ^8.2.0 + protevus_migration_runner: ^8.2.0 + protevus_orm_generator: ^8.2.0 + protevus_orm_postgres: ^8.2.0 + protevus_serialize: ^8.2.0 build_runner: ^2.4.0 logging: ^1.2.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../../http_exception -# angel3_model: +# protevus_model: # path: ../../model -# angel3_route: +# protevus_route: # path: ../../route -# angel3_mock_request: +# protevus_mock_request: # path: ../../mock_request -# angel3_serialize: +# protevus_serialize: # path: ../../serialize/angel_serialize -# angel3_serialize_generator: +# protevus_serialize_generator: # path: ../../serialize/angel_serialize_generator -# angel3_orm_test: +# protevus_orm_test: # path: ../angel_orm_test -# angel3_orm: +# protevus_orm: # path: ../angel_orm -# angel3_orm_generator: +# protevus_orm_generator: # path: ../angel_orm_generator -# angel3_orm_postgres: +# protevus_orm_postgres: # path: ../angel_orm_postgres -# angel3_migration: +# protevus_migration: # path: ../angel_migration -# angel3_migration_runner: +# protevus_migration_runner: # path: ../angel_migration_runner diff --git a/packages/orm/angel_orm_service/test/all_test.dart b/packages/orm/angel_orm_service/test/all_test.dart index 9d916f2e..b3425a5e 100644 --- a/packages/orm/angel_orm_service/test/all_test.dart +++ b/packages/orm/angel_orm_service/test/all_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_orm_postgres/angel3_orm_postgres.dart'; -import 'package:angel3_orm_service/angel3_orm_service.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_orm_postgres/protevus_orm_postgres.dart'; +import 'package:protevus_orm_service/protevus_orm_service.dart'; import 'package:logging/logging.dart'; import 'package:postgres/postgres.dart'; import 'package:test/test.dart'; diff --git a/packages/orm/angel_orm_service/test/pokemon.dart b/packages/orm/angel_orm_service/test/pokemon.dart index b4ce08a6..c3a3484b 100644 --- a/packages/orm/angel_orm_service/test/pokemon.dart +++ b/packages/orm/angel_orm_service/test/pokemon.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:optional/optional.dart'; part 'pokemon.g.dart'; diff --git a/packages/orm/angel_orm_test/README.md b/packages/orm/angel_orm_test/README.md index 153a34b6..bbbc6238 100644 --- a/packages/orm/angel_orm_test/README.md +++ b/packages/orm/angel_orm_test/README.md @@ -1,6 +1,6 @@ # Protevus ORM Test -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_orm_test?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_orm_test?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/orm/angel_orm_test/LICENSE) diff --git a/packages/orm/angel_orm_test/example/main.dart b/packages/orm/angel_orm_test/example/main.dart index bc7a9e5b..655a97fa 100644 --- a/packages/orm/angel_orm_test/example/main.dart +++ b/packages/orm/angel_orm_test/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_orm_test/src/models/car.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_orm_test/src/models/car.dart'; @Expose('/api/cars') class CarController extends Controller { diff --git a/packages/orm/angel_orm_test/lib/angel3_orm_test.dart b/packages/orm/angel_orm_test/lib/protevus_orm_test.dart similarity index 100% rename from packages/orm/angel_orm_test/lib/angel3_orm_test.dart rename to packages/orm/angel_orm_test/lib/protevus_orm_test.dart diff --git a/packages/orm/angel_orm_test/lib/src/belongs_to_test.dart b/packages/orm/angel_orm_test/lib/src/belongs_to_test.dart index f05badfb..c13a7939 100644 --- a/packages/orm/angel_orm_test/lib/src/belongs_to_test.dart +++ b/packages/orm/angel_orm_test/lib/src/belongs_to_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/book.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart b/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart index 68941fd4..ce81c2cb 100644 --- a/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart +++ b/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/custom_expr.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/edge_case_test.dart b/packages/orm/angel_orm_test/lib/src/edge_case_test.dart index 2ed01d4a..c07df2a8 100644 --- a/packages/orm/angel_orm_test/lib/src/edge_case_test.dart +++ b/packages/orm/angel_orm_test/lib/src/edge_case_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/unorthodox.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/enum_and_nested_test.dart b/packages/orm/angel_orm_test/lib/src/enum_and_nested_test.dart index 6dfa85b4..53507e7f 100644 --- a/packages/orm/angel_orm_test/lib/src/enum_and_nested_test.dart +++ b/packages/orm/angel_orm_test/lib/src/enum_and_nested_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/has_car.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/enum_test.dart b/packages/orm/angel_orm_test/lib/src/enum_test.dart index 2e4ec452..05dbe4bd 100644 --- a/packages/orm/angel_orm_test/lib/src/enum_test.dart +++ b/packages/orm/angel_orm_test/lib/src/enum_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_orm_test/src/models/has_car.dart'; +import 'package:protevus_orm_test/src/models/has_car.dart'; import 'package:test/test.dart'; void main() async { diff --git a/packages/orm/angel_orm_test/lib/src/has_many_test.dart b/packages/orm/angel_orm_test/lib/src/has_many_test.dart index 80f149d6..e26a09ce 100644 --- a/packages/orm/angel_orm_test/lib/src/has_many_test.dart +++ b/packages/orm/angel_orm_test/lib/src/has_many_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/tree.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/has_map_test.dart b/packages/orm/angel_orm_test/lib/src/has_map_test.dart index 03fe9155..1d17ca03 100644 --- a/packages/orm/angel_orm_test/lib/src/has_map_test.dart +++ b/packages/orm/angel_orm_test/lib/src/has_map_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/has_map.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/has_one_test.dart b/packages/orm/angel_orm_test/lib/src/has_one_test.dart index 22cbe06f..5ea23711 100644 --- a/packages/orm/angel_orm_test/lib/src/has_one_test.dart +++ b/packages/orm/angel_orm_test/lib/src/has_one_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/leg.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/join_test.dart b/packages/orm/angel_orm_test/lib/src/join_test.dart index efe4c969..1f5ab77a 100644 --- a/packages/orm/angel_orm_test/lib/src/join_test.dart +++ b/packages/orm/angel_orm_test/lib/src/join_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/person.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/many_to_many_test.dart b/packages/orm/angel_orm_test/lib/src/many_to_many_test.dart index eeb6f405..fc91096d 100644 --- a/packages/orm/angel_orm_test/lib/src/many_to_many_test.dart +++ b/packages/orm/angel_orm_test/lib/src/many_to_many_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/user.dart'; import 'util.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/asset.dart b/packages/orm/angel_orm_test/lib/src/models/asset.dart index 2a3bc496..47e84f35 100644 --- a/packages/orm/angel_orm_test/lib/src/models/asset.dart +++ b/packages/orm/angel_orm_test/lib/src/models/asset.dart @@ -1,6 +1,6 @@ -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:optional/optional.dart'; part 'asset.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/bike.dart b/packages/orm/angel_orm_test/lib/src/models/bike.dart index 08db8929..dbd1b40d 100644 --- a/packages/orm/angel_orm_test/lib/src/models/bike.dart +++ b/packages/orm/angel_orm_test/lib/src/models/bike.dart @@ -1,6 +1,6 @@ -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:optional/optional.dart'; part 'bike.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/boat.d.ts b/packages/orm/angel_orm_test/lib/src/models/boat.d.ts index d2ab8fbf..76c7178a 100644 --- a/packages/orm/angel_orm_test/lib/src/models/boat.d.ts +++ b/packages/orm/angel_orm_test/lib/src/models/boat.d.ts @@ -1,5 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -declare module 'angel3_orm_test' { +declare module 'protevus_orm_test' { interface Boat { id?: string; created_at?: any; diff --git a/packages/orm/angel_orm_test/lib/src/models/boat.dart b/packages/orm/angel_orm_test/lib/src/models/boat.dart index b1ccf47c..30e960ad 100644 --- a/packages/orm/angel_orm_test/lib/src/models/boat.dart +++ b/packages/orm/angel_orm_test/lib/src/models/boat.dart @@ -1,6 +1,6 @@ -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_migration/angel3_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; import 'package:optional/optional.dart'; part 'boat.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/book.dart b/packages/orm/angel_orm_test/lib/src/models/book.dart index 91c6b398..1644620a 100644 --- a/packages/orm/angel_orm_test/lib/src/models/book.dart +++ b/packages/orm/angel_orm_test/lib/src/models/book.dart @@ -1,8 +1,8 @@ library angel_orm3.generator.models.book; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'book.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/car.dart b/packages/orm/angel_orm_test/lib/src/models/car.dart index 98a3d21b..72eb4952 100644 --- a/packages/orm/angel_orm_test/lib/src/models/car.dart +++ b/packages/orm/angel_orm_test/lib/src/models/car.dart @@ -1,8 +1,8 @@ library angel_orm3.generator.models.car; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'car.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/custom_expr.dart b/packages/orm/angel_orm_test/lib/src/models/custom_expr.dart index beef30a3..c27f1d61 100644 --- a/packages/orm/angel_orm_test/lib/src/models/custom_expr.dart +++ b/packages/orm/angel_orm_test/lib/src/models/custom_expr.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'custom_expr.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/email_indexed.dart b/packages/orm/angel_orm_test/lib/src/models/email_indexed.dart index b30a3e06..0f03b3bc 100644 --- a/packages/orm/angel_orm_test/lib/src/models/email_indexed.dart +++ b/packages/orm/angel_orm_test/lib/src/models/email_indexed.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'email_indexed.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/fortune.dart b/packages/orm/angel_orm_test/lib/src/models/fortune.dart index 6e4f49af..017a5fdb 100644 --- a/packages/orm/angel_orm_test/lib/src/models/fortune.dart +++ b/packages/orm/angel_orm_test/lib/src/models/fortune.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:optional/optional.dart'; part 'fortune.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/has_car.dart b/packages/orm/angel_orm_test/lib/src/models/has_car.dart index d5ea3bc3..1169780c 100644 --- a/packages/orm/angel_orm_test/lib/src/models/has_car.dart +++ b/packages/orm/angel_orm_test/lib/src/models/has_car.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'has_car.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/has_map.dart b/packages/orm/angel_orm_test/lib/src/models/has_map.dart index 02e6ccb5..83d435d8 100644 --- a/packages/orm/angel_orm_test/lib/src/models/has_map.dart +++ b/packages/orm/angel_orm_test/lib/src/models/has_map.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'has_map.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/leg.dart b/packages/orm/angel_orm_test/lib/src/models/leg.dart index 0aeee175..9cd513d7 100644 --- a/packages/orm/angel_orm_test/lib/src/models/leg.dart +++ b/packages/orm/angel_orm_test/lib/src/models/leg.dart @@ -1,8 +1,8 @@ -library angel3_orm_generator.test.models.leg; +library protevus_orm_generator.test.models.leg; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'leg.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/order.dart b/packages/orm/angel_orm_test/lib/src/models/order.dart index 1c01398d..57503dab 100644 --- a/packages/orm/angel_orm_test/lib/src/models/order.dart +++ b/packages/orm/angel_orm_test/lib/src/models/order.dart @@ -1,8 +1,8 @@ -library angel3_orm_generator.test.models.order; +library protevus_orm_generator.test.models.order; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'order.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/person.dart b/packages/orm/angel_orm_test/lib/src/models/person.dart index 56403bd5..9ea73406 100644 --- a/packages/orm/angel_orm_test/lib/src/models/person.dart +++ b/packages/orm/angel_orm_test/lib/src/models/person.dart @@ -1,8 +1,8 @@ library angel_orm3.generator.models.person; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'person.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/person_order.dart b/packages/orm/angel_orm_test/lib/src/models/person_order.dart index eda4f1b7..2016a719 100644 --- a/packages/orm/angel_orm_test/lib/src/models/person_order.dart +++ b/packages/orm/angel_orm_test/lib/src/models/person_order.dart @@ -1,8 +1,8 @@ -library angel3_orm_generator.test.models.person_order; +library protevus_orm_generator.test.models.person_order; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'person_order.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/quotation.dart b/packages/orm/angel_orm_test/lib/src/models/quotation.dart index 02b72196..ee1e66e9 100644 --- a/packages/orm/angel_orm_test/lib/src/models/quotation.dart +++ b/packages/orm/angel_orm_test/lib/src/models/quotation.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'quotation.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/tree.dart b/packages/orm/angel_orm_test/lib/src/models/tree.dart index 022f402d..4c4fb1b8 100644 --- a/packages/orm/angel_orm_test/lib/src/models/tree.dart +++ b/packages/orm/angel_orm_test/lib/src/models/tree.dart @@ -1,8 +1,8 @@ -library angel3_orm_generator.test.models.tree; +library protevus_orm_generator.test.models.tree; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'tree.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/unorthodox.dart b/packages/orm/angel_orm_test/lib/src/models/unorthodox.dart index 3cc79bf3..28dc14f3 100644 --- a/packages/orm/angel_orm_test/lib/src/models/unorthodox.dart +++ b/packages/orm/angel_orm_test/lib/src/models/unorthodox.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'unorthodox.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/user.dart b/packages/orm/angel_orm_test/lib/src/models/user.dart index da28266e..d82f92f1 100644 --- a/packages/orm/angel_orm_test/lib/src/models/user.dart +++ b/packages/orm/angel_orm_test/lib/src/models/user.dart @@ -1,8 +1,8 @@ -library angel3_orm_generator.test.models.user; +library protevus_orm_generator.test.models.user; -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_orm/angel3_orm.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_orm/protevus_orm.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:optional/optional.dart'; part 'user.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/models/world.dart b/packages/orm/angel_orm_test/lib/src/models/world.dart index 31376268..f087cafa 100644 --- a/packages/orm/angel_orm_test/lib/src/models/world.dart +++ b/packages/orm/angel_orm_test/lib/src/models/world.dart @@ -1,6 +1,6 @@ -import 'package:angel3_migration/angel3_migration.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_migration/protevus_migration.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:optional/optional.dart'; part 'world.g.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/performance_test.dart b/packages/orm/angel_orm_test/lib/src/performance_test.dart index dd5fbae9..9bf5ef71 100644 --- a/packages/orm/angel_orm_test/lib/src/performance_test.dart +++ b/packages/orm/angel_orm_test/lib/src/performance_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:math'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/fortune.dart'; diff --git a/packages/orm/angel_orm_test/lib/src/standalone_test.dart b/packages/orm/angel_orm_test/lib/src/standalone_test.dart index eea11032..a5ed8f65 100644 --- a/packages/orm/angel_orm_test/lib/src/standalone_test.dart +++ b/packages/orm/angel_orm_test/lib/src/standalone_test.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_orm/angel3_orm.dart'; +import 'package:protevus_orm/protevus_orm.dart'; import 'package:test/test.dart'; import 'models/car.dart'; diff --git a/packages/orm/angel_orm_test/pubspec.yaml b/packages/orm/angel_orm_test/pubspec.yaml index 96fb7d64..4ecef62f 100644 --- a/packages/orm/angel_orm_test/pubspec.yaml +++ b/packages/orm/angel_orm_test/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_orm_test +name: protevus_orm_test version: 8.2.1 description: Common tests for Protevus ORM. Reference implmentation of the generated ORM files. homepage: https://protevus-framework.web.app/ @@ -6,39 +6,39 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/orm/an environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_migration: ^8.2.0 - angel3_model: ^8.2.0 - angel3_orm: ^8.2.0 - angel3_serialize: ^8.2.0 + protevus_migration: ^8.2.0 + protevus_model: ^8.2.0 + protevus_orm: ^8.2.0 + protevus_serialize: ^8.2.0 io: ^1.0.0 test: ^1.24.0 collection: ^1.17.0 optional: ^6.1.0 dev_dependencies: - angel3_orm_generator: ^8.3.0 - angel3_framework: ^8.4.0 + protevus_orm_generator: ^8.3.0 + protevus_framework: ^8.4.0 build_runner: ^2.4.0 lints: ^4.0.0 #dependency_overrides: -# angel3_container: +# protevus_container: # path: ../../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../../http_exception -# angel3_model: +# protevus_model: # path: ../../model -# angel3_route: +# protevus_route: # path: ../../route -# angel3_mock_request: +# protevus_mock_request: # path: ../../mock_request -# angel3_serialize: +# protevus_serialize: # path: ../../serialize/angel_serialize -# angel3_serialize_generator: +# protevus_serialize_generator: # path: ../../serialize/angel_serialize_generator -# angel3_orm: +# protevus_orm: # path: ../angel_orm -# angel3_migration: +# protevus_migration: # path: ../angel_migration -# angel3_orm_generator: +# protevus_orm_generator: # path: ../angel_orm_generator diff --git a/packages/paginate/README.md b/packages/paginate/README.md index 557dc09a..fc3c076d 100644 --- a/packages/paginate/README.md +++ b/packages/paginate/README.md @@ -1,6 +1,6 @@ # Protevus Paginate -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_paginate?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_paginate?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/paginate/LICENSE) @@ -13,7 +13,7 @@ In your `pubspec.yaml` file: ```yaml dependencies: - angel3_paginate: ^6.0.0 + protevus_paginate: ^6.0.0 ``` ## Usage @@ -38,7 +38,7 @@ Results can be parsed from Maps using the `PaginationResult.fromMap` construc To create a paginator: ```dart -import 'package:angel3_paginate/angel3_paginate.dart'; +import 'package:protevus_paginate/protevus_paginate.dart'; void main() { var p = new Paginator(iterable); diff --git a/packages/paginate/example/main.dart b/packages/paginate/example/main.dart index af5c5181..d2c32209 100644 --- a/packages/paginate/example/main.dart +++ b/packages/paginate/example/main.dart @@ -1,4 +1,4 @@ -import 'package:angel3_paginate/angel3_paginate.dart'; +import 'package:protevus_paginate/protevus_paginate.dart'; void main() { var iterable = [1, 2, 3, 4]; diff --git a/packages/paginate/lib/angel3_paginate.dart b/packages/paginate/lib/protevus_paginate.dart similarity index 100% rename from packages/paginate/lib/angel3_paginate.dart rename to packages/paginate/lib/protevus_paginate.dart diff --git a/packages/paginate/pubspec.yaml b/packages/paginate/pubspec.yaml index 26b3b804..2481286b 100644 --- a/packages/paginate/pubspec.yaml +++ b/packages/paginate/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_paginate +name: protevus_paginate version: 8.2.0 description: Platform-agnostic pagination library, with custom support for the Protevus framework. homepage: https://protevus-framework.web.app/ @@ -6,32 +6,32 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/pagina environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 logging: ^1.2.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_test: +# protevus_test: # path: ../test -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/paginate/test/bounds_test.dart b/packages/paginate/test/bounds_test.dart index c2826808..64e0be91 100644 --- a/packages/paginate/test/bounds_test.dart +++ b/packages/paginate/test/bounds_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_paginate/angel3_paginate.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_paginate/protevus_paginate.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; diff --git a/packages/paginate/test/paginate_test.dart b/packages/paginate/test/paginate_test.dart index 0d2ee393..0620099d 100644 --- a/packages/paginate/test/paginate_test.dart +++ b/packages/paginate/test/paginate_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_paginate/angel3_paginate.dart'; +import 'package:protevus_paginate/protevus_paginate.dart'; import 'package:test/test.dart'; // Count-down from 100, then 101 at the end... diff --git a/packages/production/README.md b/packages/production/README.md index 18715f8b..f1d31013 100644 --- a/packages/production/README.md +++ b/packages/production/README.md @@ -1,6 +1,6 @@ # Protevus Production Runner -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_production?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_production?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/protevus/tree/master/packages/production/LICENSE) @@ -20,8 +20,8 @@ Instantiate it as follows, and your file will become a command-line executable t ```dart import 'dart:async'; import 'dart:isolate'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_production/angel3_production.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_production/protevus_production.dart'; void main(List args) => Runner('example', configureServer).run(args); diff --git a/packages/production/example/main.dart b/packages/production/example/main.dart index e95152ca..f41d9b9d 100644 --- a/packages/production/example/main.dart +++ b/packages/production/example/main.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:isolate'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_production/angel3_production.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_production/protevus_production.dart'; import 'package:belatuk_pub_sub/belatuk_pub_sub.dart'; void main(List args) { diff --git a/packages/production/lib/angel3_production.dart b/packages/production/lib/protevus_production.dart similarity index 100% rename from packages/production/lib/angel3_production.dart rename to packages/production/lib/protevus_production.dart diff --git a/packages/production/lib/src/runner.dart b/packages/production/lib/src/runner.dart index db6b3551..e3da1467 100644 --- a/packages/production/lib/src/runner.dart +++ b/packages/production/lib/src/runner.dart @@ -4,10 +4,10 @@ import 'dart:isolate'; import 'package:belatuk_pub_sub/belatuk_pub_sub.dart'; import 'package:belatuk_pub_sub/isolate.dart'; import 'package:intl/intl.dart'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_framework/http2.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_framework/http2.dart'; import 'package:args/args.dart'; import 'package:io/ansi.dart'; import 'package:io/io.dart'; diff --git a/packages/production/pubspec.yaml b/packages/production/pubspec.yaml index 8a33c5d9..f53efa6c 100644 --- a/packages/production/pubspec.yaml +++ b/packages/production/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_production +name: protevus_production version: 8.3.0 description: Helpers for concurrency, message-passing, rotating loggers, and other production functionality in Protevus. homepage: https://protevus-framework.web.app @@ -6,8 +6,8 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/produc environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_container: ^8.0.0 - angel3_framework: ^8.2.0 + protevus_container: ^8.0.0 + protevus_framework: ^8.2.0 belatuk_pub_sub: ^6.1.0 args: ^2.4.0 io: ^1.0.0 @@ -16,15 +16,15 @@ dependencies: dev_dependencies: lints: ^4.0.0 #dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request diff --git a/packages/proxy/README.md b/packages/proxy/README.md index 17944bb1..1773d44f 100644 --- a/packages/proxy/README.md +++ b/packages/proxy/README.md @@ -1,6 +1,6 @@ # Protevus Proxy -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_proxy?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_proxy?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/proxy/LICENSE) @@ -8,7 +8,7 @@ Protevus middleware to forward requests to another server (i.e. `webdev serve`). Also supports WebSockets. ```dart -import 'package:angel3_proxy/angel3_proxy.dart'; +import 'package:protevus_proxy/protevus_proxy.dart'; import 'package:http/http.dart' as http; void main() async { diff --git a/packages/proxy/example/main.dart b/packages/proxy/example/main.dart index 96dcf97a..ab4ad183 100644 --- a/packages/proxy/example/main.dart +++ b/packages/proxy/example/main.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_proxy/angel3_proxy.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_proxy/protevus_proxy.dart'; import 'package:logging/logging.dart'; final Duration timeout = Duration(seconds: 5); diff --git a/packages/proxy/lib/angel3_proxy.dart b/packages/proxy/lib/protevus_proxy.dart similarity index 57% rename from packages/proxy/lib/angel3_proxy.dart rename to packages/proxy/lib/protevus_proxy.dart index e375a932..5228c37a 100644 --- a/packages/proxy/lib/angel3_proxy.dart +++ b/packages/proxy/lib/protevus_proxy.dart @@ -1,3 +1,3 @@ -library angel3_proxy; +library protevus_proxy; export 'src/proxy_layer.dart'; diff --git a/packages/proxy/lib/src/proxy_layer.dart b/packages/proxy/lib/src/proxy_layer.dart index 61559677..4f65b2c8 100644 --- a/packages/proxy/lib/src/proxy_layer.dart +++ b/packages/proxy/lib/src/proxy_layer.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:io' hide BytesBuilder; import 'dart:typed_data'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:http_parser/http_parser.dart'; import 'package:http/http.dart' as http; import 'package:path/path.dart'; diff --git a/packages/proxy/pubspec.yaml b/packages/proxy/pubspec.yaml index cd21d6e0..7b3411fe 100644 --- a/packages/proxy/pubspec.yaml +++ b/packages/proxy/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_proxy +name: protevus_proxy version: 8.2.0 description: Protevus middleware to forward requests to another server (i.e. pub serve). homepage: https://protevus-framework.web.app/ @@ -6,36 +6,36 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/proxy environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 http: ^1.0.0 http_parser: ^4.0.0 path: ^1.9.0 dev_dependencies: - angel3_test: ^8.0.0 - angel3_mock_request: ^8.0.0 + protevus_test: ^8.0.0 + protevus_mock_request: ^8.0.0 logging: ^1.2.0 lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_test: +# protevus_test: # path: ../test -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_client: +# protevus_client: # path: ../client -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/proxy/test/basic_test.dart b/packages/proxy/test/basic_test.dart index b96d04f0..bd24b6b2 100644 --- a/packages/proxy/test/basic_test.dart +++ b/packages/proxy/test/basic_test.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_proxy/angel3_proxy.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_proxy/protevus_proxy.dart'; import 'package:http/io_client.dart' as http; import 'package:logging/logging.dart'; import 'package:test/test.dart'; diff --git a/packages/proxy/test/common.dart b/packages/proxy/test/common.dart index 41c7a123..457298ad 100644 --- a/packages/proxy/test/common.dart +++ b/packages/proxy/test/common.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; import 'package:logging/logging.dart'; Future startTestServer() { diff --git a/packages/proxy/test/pub_serve_test.dart b/packages/proxy/test/pub_serve_test.dart index cc7ecef7..684f2c5a 100644 --- a/packages/proxy/test/pub_serve_test.dart +++ b/packages/proxy/test/pub_serve_test.dart @@ -1,11 +1,11 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_proxy/angel3_proxy.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_proxy/protevus_proxy.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:logging/logging.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/redis/README.md b/packages/redis/README.md index 3e984ada..1f816d4b 100644 --- a/packages/redis/README.md +++ b/packages/redis/README.md @@ -1,42 +1,42 @@ # Protevus Redis -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_redis?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_redis?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/redis/LICENSE) **Forked from `angel_redis` to support NNBD** -Redis-enabled services for the Protevus framework. `RedisService` can be used alone, *or* as the backend of a [`CacheService`](https://pub.dev/packages/angel3_cache), and thereby cache the results of calling an upstream database. +Redis-enabled services for the Protevus framework. `RedisService` can be used alone, *or* as the backend of a [`CacheService`](https://pub.dev/packages/protevus_cache), and thereby cache the results of calling an upstream database. ## Installation -`package:angel3_redis` requires Protevus. +`package:protevus_redis` requires Protevus. In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^8.0.0 - angel3_redis: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_redis: ^8.0.0 ``` ## Usage -Pass an instance of `RespCommandsTier2` (from `package:resp_client`) to the `RedisService` constructor. You can also pass an optional prefix, which is recommended if you are using `angel3_redis` for multiple logically-separate collections. Redis is a flat key-value store; by prefixing the keys used, `angel3_redis` can provide the experience of using separate stores, rather than a single node. +Pass an instance of `RespCommandsTier2` (from `package:resp_client`) to the `RedisService` constructor. You can also pass an optional prefix, which is recommended if you are using `protevus_redis` for multiple logically-separate collections. Redis is a flat key-value store; by prefixing the keys used, `protevus_redis` can provide the experience of using separate stores, rather than a single node. Without a prefix, there's a chance that different collections can overwrite one another's data. ## Notes -* Neither `index`, nor `modify` is atomic; each performs two separate queries.`angel3_redis` stores data as JSON strings, rather than as Redis hashes, so an update-in-place is impossible. +* Neither `index`, nor `modify` is atomic; each performs two separate queries.`protevus_redis` stores data as JSON strings, rather than as Redis hashes, so an update-in-place is impossible. * `index` uses Redis' `KEYS` functionality, so use it sparingly in production, if at all. In a larger database, it can quickly become a bottleneck. * `remove` uses `MULTI`+`EXEC` in a transaction. * Prefer using `update`, rather than `modify`. The former only performs one query, though it does overwrite the current contents for a given key. * When calling `create`, it's possible that you may already have an `id` in mind to insert into the store. For example, -when caching another database, you'll preserve the ID or primary key of an item. `angel3_redis` heeds this. If no +when caching another database, you'll preserve the ID or primary key of an item. `protevus_redis` heeds this. If no `id` is present, then an ID will be created via an `INCR` call. ## Example @@ -44,7 +44,7 @@ when caching another database, you'll preserve the ID or primary key of an item. Also present at `example/main.dart`: ```dart -import 'package:angel3_redis/angel3_redis.dart'; +import 'package:protevus_redis/protevus_redis.dart'; import 'package:resp_client/resp_client.dart'; import 'package:resp_client/resp_commands.dart'; import 'package:resp_client/resp_server.dart'; diff --git a/packages/redis/example/main.dart b/packages/redis/example/main.dart index 1354ef4e..5d8fedcb 100644 --- a/packages/redis/example/main.dart +++ b/packages/redis/example/main.dart @@ -1,4 +1,4 @@ -import 'package:angel3_redis/angel3_redis.dart'; +import 'package:protevus_redis/protevus_redis.dart'; import 'package:resp_client/resp_client.dart'; import 'package:resp_client/resp_commands.dart'; import 'package:resp_client/resp_server.dart'; diff --git a/packages/redis/lib/angel3_redis.dart b/packages/redis/lib/protevus_redis.dart similarity index 100% rename from packages/redis/lib/angel3_redis.dart rename to packages/redis/lib/protevus_redis.dart diff --git a/packages/redis/lib/src/redis_service.dart b/packages/redis/lib/src/redis_service.dart index ec869524..fc4ee240 100644 --- a/packages/redis/lib/src/redis_service.dart +++ b/packages/redis/lib/src/redis_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:resp_client/resp_client.dart'; import 'package:resp_client/resp_commands.dart'; diff --git a/packages/redis/pubspec.yaml b/packages/redis/pubspec.yaml index 23800b4f..567d752d 100644 --- a/packages/redis/pubspec.yaml +++ b/packages/redis/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_redis +name: protevus_redis version: 8.2.0 description: An Protevus service provider for Redis. Works well for caching volatile data. homepage: https://protevus-framework.web.app/ @@ -6,22 +6,22 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/redis environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 - angel3_http_exception: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_http_exception: ^8.0.0 resp_client: ^1.2.0 dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request \ No newline at end of file diff --git a/packages/redis/test/all_test.dart b/packages/redis/test/all_test.dart index 3cd38257..1fde4171 100644 --- a/packages/redis/test/all_test.dart +++ b/packages/redis/test/all_test.dart @@ -1,5 +1,5 @@ -import 'package:angel3_http_exception/angel3_http_exception.dart'; -import 'package:angel3_redis/angel3_redis.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; +import 'package:protevus_redis/protevus_redis.dart'; import 'package:resp_client/resp_client.dart'; import 'package:resp_client/resp_commands.dart'; import 'package:resp_client/resp_server.dart'; diff --git a/packages/rethinkdb/README.md b/packages/rethinkdb/README.md index 4d6517b1..632448ab 100644 --- a/packages/rethinkdb/README.md +++ b/packages/rethinkdb/README.md @@ -1,6 +1,6 @@ # Protevus RethinkDB -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_rethinkdb?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_rethinkdb?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/mongo/LICENSE) @@ -13,7 +13,7 @@ Add the following to your `pubspec.yaml`: ```yaml dependencies: - angel3_rethink: ^8.0.0 + protevus_rethink: ^8.0.0 ``` `belatuk-rethinkdb` driver will be used for connecting to RethinkDB. diff --git a/packages/rethinkdb/example/example.dart b/packages/rethinkdb/example/example.dart index 254bf0a8..8638276e 100644 --- a/packages/rethinkdb/example/example.dart +++ b/packages/rethinkdb/example/example.dart @@ -1,5 +1,5 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_rethinkdb/angel3_rethinkdb.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_rethinkdb/protevus_rethinkdb.dart'; import 'package:belatuk_rethinkdb/belatuk_rethinkdb.dart'; import 'package:logging/logging.dart'; diff --git a/packages/rethinkdb/lib/angel3_rethinkdb.dart b/packages/rethinkdb/lib/protevus_rethinkdb.dart similarity index 100% rename from packages/rethinkdb/lib/angel3_rethinkdb.dart rename to packages/rethinkdb/lib/protevus_rethinkdb.dart diff --git a/packages/rethinkdb/lib/src/rethink_service.dart b/packages/rethinkdb/lib/src/rethink_service.dart index fe106f0a..98bb451d 100644 --- a/packages/rethinkdb/lib/src/rethink_service.dart +++ b/packages/rethinkdb/lib/src/rethink_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; //import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:belatuk_json_serializer/belatuk_json_serializer.dart' as god; import 'package:belatuk_rethinkdb/belatuk_rethinkdb.dart'; diff --git a/packages/rethinkdb/pubspec.yaml b/packages/rethinkdb/pubspec.yaml index 02185abc..c087d378 100644 --- a/packages/rethinkdb/pubspec.yaml +++ b/packages/rethinkdb/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_rethinkdb +name: protevus_rethinkdb version: 8.0.1 description: This is RethinkDB service for Protevus framework. RethinkDB is an open-source database for the realtime web. environment: @@ -6,14 +6,14 @@ environment: homepage: https://protevus-framework.web.app/ repository: https://github.com/dart-backend/protevus/tree/master/packages/rethinkdb dependencies: - angel3_framework: ^8.4.0 - angel3_container: ^8.2.0 + protevus_framework: ^8.4.0 + protevus_container: ^8.2.0 belatuk_json_serializer: ^7.0.0 belatuk_rethinkdb: ^1.0.0 dev_dependencies: - angel3_client: ^8.2.0 - angel3_test: ^8.2.0 + protevus_client: ^8.2.0 + protevus_test: ^8.2.0 logging: ^1.2.0 test: ^1.25.0 lints: ^4.0.0 diff --git a/packages/rethinkdb/test/generic_test.dart b/packages/rethinkdb/test/generic_test.dart index dea672e9..16d7138b 100644 --- a/packages/rethinkdb/test/generic_test.dart +++ b/packages/rethinkdb/test/generic_test.dart @@ -1,8 +1,8 @@ -import 'package:angel3_client/angel3_client.dart' as c; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_rethinkdb/angel3_rethinkdb.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_client/protevus_client.dart' as c; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_rethinkdb/protevus_rethinkdb.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:logging/logging.dart'; import 'package:belatuk_rethinkdb/belatuk_rethinkdb.dart'; import 'package:test/test.dart'; diff --git a/packages/security/README.md b/packages/security/README.md index 42216c0f..cf816ed1 100644 --- a/packages/security/README.md +++ b/packages/security/README.md @@ -1,6 +1,6 @@ # Protevus Security -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_security?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_security?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/security/LICENSE) diff --git a/packages/security/example/cookie_signer.dart b/packages/security/example/cookie_signer.dart index dadf5169..7c997e09 100644 --- a/packages/security/example/cookie_signer.dart +++ b/packages/security/example/cookie_signer.dart @@ -1,8 +1,8 @@ import 'dart:io'; import 'dart:math'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_security/angel3_security.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_security/protevus_security.dart'; import 'package:logging/logging.dart'; import 'package:belatuk_pretty_logging/belatuk_pretty_logging.dart'; diff --git a/packages/security/example/main.dart b/packages/security/example/main.dart index 686b3a44..0f36f3a3 100644 --- a/packages/security/example/main.dart +++ b/packages/security/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_security/angel3_security.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_security/protevus_security.dart'; import 'package:logging/logging.dart'; import 'package:belatuk_pretty_logging/belatuk_pretty_logging.dart'; diff --git a/packages/security/example/rate_limit_redis.dart b/packages/security/example/rate_limit_redis.dart index 5934b532..17a3ff7e 100644 --- a/packages/security/example/rate_limit_redis.dart +++ b/packages/security/example/rate_limit_redis.dart @@ -1,7 +1,7 @@ -import 'package:angel3_redis/angel3_redis.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_production/angel3_production.dart'; -import 'package:angel3_security/angel3_security.dart'; +import 'package:protevus_redis/protevus_redis.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_production/protevus_production.dart'; +import 'package:protevus_security/protevus_security.dart'; import 'package:resp_client/resp_client.dart'; import 'package:resp_client/resp_commands.dart'; import 'package:resp_client/resp_server.dart'; diff --git a/packages/security/lib/angel3_security.dart b/packages/security/lib/protevus_security.dart similarity index 100% rename from packages/security/lib/angel3_security.dart rename to packages/security/lib/protevus_security.dart diff --git a/packages/security/lib/src/cookie_signer.dart b/packages/security/lib/src/cookie_signer.dart index 07bf14bb..7ea139bc 100644 --- a/packages/security/lib/src/cookie_signer.dart +++ b/packages/security/lib/src/cookie_signer.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:crypto/crypto.dart'; /// A utility that signs, and verifies, cookies using an [Hmac]. diff --git a/packages/security/lib/src/csrf_filter.dart b/packages/security/lib/src/csrf_filter.dart index acc4fece..aa7fd548 100644 --- a/packages/security/lib/src/csrf_filter.dart +++ b/packages/security/lib/src/csrf_filter.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'cookie_signer.dart'; class CsrfToken { diff --git a/packages/security/lib/src/in_memory_rate_limiter.dart b/packages/security/lib/src/in_memory_rate_limiter.dart index 8ef91d22..8f50dfbd 100644 --- a/packages/security/lib/src/in_memory_rate_limiter.dart +++ b/packages/security/lib/src/in_memory_rate_limiter.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'rate_limiter.dart'; import 'rate_limiting_window.dart'; diff --git a/packages/security/lib/src/rate_limiter.dart b/packages/security/lib/src/rate_limiter.dart index cd98edec..c9f28d00 100644 --- a/packages/security/lib/src/rate_limiter.dart +++ b/packages/security/lib/src/rate_limiter.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_security/angel3_security.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_security/protevus_security.dart'; import 'rate_limiting_window.dart'; /// A base class that facilitates rate limiting API's or endpoints, diff --git a/packages/security/lib/src/service_rate_limiter.dart b/packages/security/lib/src/service_rate_limiter.dart index e287db32..185e09d9 100644 --- a/packages/security/lib/src/service_rate_limiter.dart +++ b/packages/security/lib/src/service_rate_limiter.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'rate_limiter.dart'; import 'rate_limiting_window.dart'; diff --git a/packages/security/pubspec.yaml b/packages/security/pubspec.yaml index a3b021b4..2950e27a 100644 --- a/packages/security/pubspec.yaml +++ b/packages/security/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_security +name: protevus_security version: 8.2.0 description: Protevus infrastructure for improving security, rate limiting, and more homepage: https://protevus-framework.web.app/ @@ -6,43 +6,43 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/securi environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 crypto: ^3.0.1 dev_dependencies: - angel3_auth: ^8.0.0 - angel3_production: ^8.0.0 - angel3_redis: ^8.0.0 - angel3_test: ^8.0.0 - angel3_validate: ^8.0.0 + protevus_auth: ^8.0.0 + protevus_production: ^8.0.0 + protevus_redis: ^8.0.0 + protevus_test: ^8.0.0 + protevus_validate: ^8.0.0 belatuk_pretty_logging: ^6.1.0 test: ^1.24.0 logging: ^1.2.0 resp_client: ^1.2.0 lints: ^4.0.0 # dependency_overrides: -# angel3_production: +# protevus_production: # path: ../production -# angel3_redis: +# protevus_redis: # path: ../redis -# angel3_test: +# protevus_test: # path: ../test -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/sembast/README.md b/packages/sembast/README.md index 160cf357..72e05f4b 100644 --- a/packages/sembast/README.md +++ b/packages/sembast/README.md @@ -1,6 +1,6 @@ # Sembast Persistent Service for Protevus -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_sembast?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_sembast?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/sembast/LICENSE) @@ -13,7 +13,7 @@ Add the following to your `pubspec.yaml`: ```yaml dependencies: - angel3_sembast: ^8.0.0 + protevus_sembast: ^8.0.0 ``` ## Usage diff --git a/packages/sembast/example/main.dart b/packages/sembast/example/main.dart index 8d1f6269..f7b6b1d5 100644 --- a/packages/sembast/example/main.dart +++ b/packages/sembast/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_sembast/angel3_sembast.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_sembast/protevus_sembast.dart'; import 'package:logging/logging.dart'; import 'package:sembast/sembast_io.dart'; diff --git a/packages/sembast/lib/angel3_sembast.dart b/packages/sembast/lib/protevus_sembast.dart similarity index 98% rename from packages/sembast/lib/angel3_sembast.dart rename to packages/sembast/lib/protevus_sembast.dart index d2f9a81a..616fb723 100644 --- a/packages/sembast/lib/angel3_sembast.dart +++ b/packages/sembast/lib/protevus_sembast.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:sembast/sembast.dart'; class SembastService extends Service> { diff --git a/packages/sembast/pubspec.yaml b/packages/sembast/pubspec.yaml index ee94957f..5fb4f417 100644 --- a/packages/sembast/pubspec.yaml +++ b/packages/sembast/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_sembast +name: protevus_sembast version: 8.2.0 description: A plugin service that persist data to Sembast for Protevus framework. homepage: https://protevus-framework.web.app/ @@ -6,23 +6,23 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/sembas environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 sembast: ^3.1.1 dev_dependencies: - angel3_http_exception: ^8.0.0 + protevus_http_exception: ^8.0.0 logging: ^1.2.0 lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request diff --git a/packages/sembast/test/all_test.dart b/packages/sembast/test/all_test.dart index 9dbdc473..fb680f9b 100644 --- a/packages/sembast/test/all_test.dart +++ b/packages/sembast/test/all_test.dart @@ -1,6 +1,6 @@ import 'dart:collection'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_sembast/angel3_sembast.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_sembast/protevus_sembast.dart'; import 'package:sembast/sembast.dart'; import 'package:sembast/sembast_io.dart'; import 'package:test/test.dart'; diff --git a/packages/seo/README.md b/packages/seo/README.md index a092a146..23f40449 100644 --- a/packages/seo/README.md +++ b/packages/seo/README.md @@ -1,11 +1,11 @@ # Protevus SEO -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_seo?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_seo?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/seo/LICENSE) -Helpers for building SEO-friendly Web pages in Protevus. The goal of `package:angel3_seo` is to speed up perceived client page loads, prevent the infamous [flash of unstyled content](https://en.wikipedia.org/wiki/Flash_of_unstyled_content), and other SEO optimizations that can easily become tedious to perform by hand. +Helpers for building SEO-friendly Web pages in Protevus. The goal of `package:protevus_seo` is to speed up perceived client page loads, prevent the infamous [flash of unstyled content](https://en.wikipedia.org/wiki/Flash_of_unstyled_content), and other SEO optimizations that can easily become tedious to perform by hand. ## Disabling inlining per-element @@ -24,9 +24,9 @@ In any `text/html` response sent down, `link` and `script` elements that point t In this case, "internal resources" refers to a URI *without* a scheme, i.e. `/site.css` or `foo/bar/baz.js`. ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_seo/angel3_seo.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_seo/protevus_seo.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; void main() async { @@ -48,9 +48,9 @@ void main() async { This function is a simple one; it wraps a `VirtualDirectory` to patch the way it sends `.html` files. Produces the same functionality as `inlineAssets`. ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_seo/angel3_seo.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_seo/protevus_seo.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; void main() async { diff --git a/packages/seo/example/main.dart b/packages/seo/example/main.dart index 0affb354..82ad63dd 100644 --- a/packages/seo/example/main.dart +++ b/packages/seo/example/main.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_seo/angel3_seo.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_seo/protevus_seo.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; import 'package:http_parser/http_parser.dart'; diff --git a/packages/seo/lib/angel3_seo.dart b/packages/seo/lib/protevus_seo.dart similarity index 100% rename from packages/seo/lib/angel3_seo.dart rename to packages/seo/lib/protevus_seo.dart diff --git a/packages/seo/lib/src/inline_assets.dart b/packages/seo/lib/src/inline_assets.dart index 63e7863d..38459d4a 100644 --- a/packages/seo/lib/src/inline_assets.dart +++ b/packages/seo/lib/src/inline_assets.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/file.dart'; import 'package:html/dom.dart' as html; import 'package:html/parser.dart' as html; diff --git a/packages/seo/pubspec.yaml b/packages/seo/pubspec.yaml index b8830177..b69f1fae 100644 --- a/packages/seo/pubspec.yaml +++ b/packages/seo/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_seo +name: protevus_seo version: 8.2.0 description: Helper infrastructure for building SEO-friendly Web backends in Protevus. homepage: https://protevus-framework.web.app/ @@ -6,39 +6,39 @@ repository: https://github.com/dart-backend/protevus/tree/protevus/packages/seo environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 - angel3_static: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_static: ^8.0.0 file: ^7.0.0 html: ^0.15.0 http_parser: ^4.0.0 path: ^1.9.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 logging: ^1.2.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_static: +# protevus_static: # path: ../static -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_test: +# protevus_test: # path: ../test -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/seo/test/inline_assets_test.dart b/packages/seo/test/inline_assets_test.dart index b949b0d8..a4af4a4b 100644 --- a/packages/seo/test/inline_assets_test.dart +++ b/packages/seo/test/inline_assets_test.dart @@ -1,7 +1,7 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_seo/angel3_seo.dart'; -import 'package:angel3_static/angel3_static.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_seo/protevus_seo.dart'; +import 'package:protevus_static/protevus_static.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:html/dom.dart' as html; diff --git a/packages/serialize/angel_serialize/.gitignore b/packages/serialize/serialize/.gitignore similarity index 100% rename from packages/serialize/angel_serialize/.gitignore rename to packages/serialize/serialize/.gitignore diff --git a/packages/serialize/angel_serialize/AUTHORS.md b/packages/serialize/serialize/AUTHORS.md similarity index 100% rename from packages/serialize/angel_serialize/AUTHORS.md rename to packages/serialize/serialize/AUTHORS.md diff --git a/packages/serialize/angel_serialize/CHANGELOG.md b/packages/serialize/serialize/CHANGELOG.md similarity index 100% rename from packages/serialize/angel_serialize/CHANGELOG.md rename to packages/serialize/serialize/CHANGELOG.md diff --git a/packages/serialize/angel_serialize/LICENSE b/packages/serialize/serialize/LICENSE similarity index 100% rename from packages/serialize/angel_serialize/LICENSE rename to packages/serialize/serialize/LICENSE diff --git a/packages/serialize/angel_serialize/README.md b/packages/serialize/serialize/README.md similarity index 92% rename from packages/serialize/angel_serialize/README.md rename to packages/serialize/serialize/README.md index 72265bbb..3e22accd 100644 --- a/packages/serialize/angel_serialize/README.md +++ b/packages/serialize/serialize/README.md @@ -1,6 +1,6 @@ # Protevus Serialization -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_serialize?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_serialize?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/serialize/angel_serialize/LICENSE) diff --git a/packages/serialize/angel_serialize/analysis_options.yaml b/packages/serialize/serialize/analysis_options.yaml similarity index 100% rename from packages/serialize/angel_serialize/analysis_options.yaml rename to packages/serialize/serialize/analysis_options.yaml diff --git a/packages/serialize/angel_serialize/example/main.dart b/packages/serialize/serialize/example/main.dart similarity index 62% rename from packages/serialize/angel_serialize/example/main.dart rename to packages/serialize/serialize/example/main.dart index 6b406f86..2f235c5c 100644 --- a/packages/serialize/angel_serialize/example/main.dart +++ b/packages/serialize/serialize/example/main.dart @@ -1,5 +1,5 @@ // ignore_for_file: unused_element -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; @serializable class _Todo { diff --git a/packages/serialize/angel_serialize/lib/angel3_serialize.dart b/packages/serialize/serialize/lib/protevus_serialize.dart similarity index 98% rename from packages/serialize/angel_serialize/lib/angel3_serialize.dart rename to packages/serialize/serialize/lib/protevus_serialize.dart index cba003a6..21565c4b 100644 --- a/packages/serialize/angel_serialize/lib/angel3_serialize.dart +++ b/packages/serialize/serialize/lib/protevus_serialize.dart @@ -1,5 +1,5 @@ export 'dart:convert' show json, Codec, Converter; -export 'package:angel3_model/angel3_model.dart'; +export 'package:protevus_model/protevus_model.dart'; export 'package:collection/collection.dart'; export 'package:meta/meta.dart' show required, Required; export 'package:quiver/core.dart' show hashObjects; diff --git a/packages/serialize/angel_serialize/pubspec.yaml b/packages/serialize/serialize/pubspec.yaml similarity index 74% rename from packages/serialize/angel_serialize/pubspec.yaml rename to packages/serialize/serialize/pubspec.yaml index 65a15aca..72b9b6ac 100644 --- a/packages/serialize/angel_serialize/pubspec.yaml +++ b/packages/serialize/serialize/pubspec.yaml @@ -1,18 +1,18 @@ -name: angel3_serialize +name: protevus_serialize version: 8.2.0 -description: Static annotations powering Protevus model serialization. Combine with angel3_serialize_generator for flexible modeling. +description: Static annotations powering Protevus model serialization. Combine with protevus_serialize_generator for flexible modeling. homepage: https://protevus-framework.web.app/ repository: https://github.com/dart-backend/protevus/tree/master/packages/serialize/angel_serialize environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_model: ^8.0.0 + protevus_model: ^8.0.0 collection: ^1.17.0 meta: ^1.9.0 quiver: ^3.2.0 dev_dependencies: lints: ^4.0.0 # dependency_overrides: -# angel3_model: +# protevus_model: # path: ../../model diff --git a/packages/serialize/angel_serialize_generator/.gitignore b/packages/serialize/serialize_generator/.gitignore similarity index 100% rename from packages/serialize/angel_serialize_generator/.gitignore rename to packages/serialize/serialize_generator/.gitignore diff --git a/packages/serialize/angel_serialize_generator/AUTHORS.md b/packages/serialize/serialize_generator/AUTHORS.md similarity index 100% rename from packages/serialize/angel_serialize_generator/AUTHORS.md rename to packages/serialize/serialize_generator/AUTHORS.md diff --git a/packages/serialize/angel_serialize_generator/CHANGELOG.md b/packages/serialize/serialize_generator/CHANGELOG.md similarity index 100% rename from packages/serialize/angel_serialize_generator/CHANGELOG.md rename to packages/serialize/serialize_generator/CHANGELOG.md diff --git a/packages/serialize/angel_serialize_generator/LICENSE b/packages/serialize/serialize_generator/LICENSE similarity index 100% rename from packages/serialize/angel_serialize_generator/LICENSE rename to packages/serialize/serialize_generator/LICENSE diff --git a/packages/serialize/angel_serialize_generator/README.md b/packages/serialize/serialize_generator/README.md similarity index 88% rename from packages/serialize/angel_serialize_generator/README.md rename to packages/serialize/serialize_generator/README.md index ffcda90e..fd1c18c6 100644 --- a/packages/serialize/angel_serialize_generator/README.md +++ b/packages/serialize/serialize_generator/README.md @@ -1,6 +1,6 @@ # Protevus Serialize Generator -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_serialize_generator?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_serialize_generator?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/serialize/angel_serialize_generator/LICENSE) @@ -12,7 +12,7 @@ The builder for Protevus serialization. 1. Create a model class in `todo.dart` and annotate it with `@serializable` ```dart - import 'package:angel3_serialize/angel3_serialize.dart'; + import 'package:protevus_serialize/protevus_serialize.dart'; part 'todo.g.dart'; @serializable diff --git a/packages/serialize/angel_serialize_generator/analysis_options.yaml b/packages/serialize/serialize_generator/analysis_options.yaml similarity index 100% rename from packages/serialize/angel_serialize_generator/analysis_options.yaml rename to packages/serialize/serialize_generator/analysis_options.yaml diff --git a/packages/serialize/angel_serialize_generator/build.yaml b/packages/serialize/serialize_generator/build.yaml similarity index 68% rename from packages/serialize/angel_serialize_generator/build.yaml rename to packages/serialize/serialize_generator/build.yaml index 6648010b..6c219011 100644 --- a/packages/serialize/angel_serialize_generator/build.yaml +++ b/packages/serialize/serialize_generator/build.yaml @@ -1,6 +1,6 @@ builders: angel_serialize: - import: "package:angel3_serialize_generator/angel3_serialize_generator.dart" + import: "package:protevus_serialize_generator/protevus_serialize_generator.dart" builder_factories: - jsonModelBuilder - serializerBuilder @@ -8,12 +8,12 @@ builders: build_to: cache build_extensions: .dart: - - ".angel3_serialize.g.part" - - ".angel3_serialize_serializer.g.part" + - ".protevus_serialize.g.part" + - ".protevus_serialize_serializer.g.part" applies_builders: ["source_gen|combining_builder", "source_gen|part_cleanup"] - runs_before: ["angel3_orm_generator|angel3_orm"] + runs_before: ["protevus_orm_generator|protevus_orm"] typescript: - import: "package:angel3_serialize_generator/angel3_serialize_generator.dart" + import: "package:protevus_serialize_generator/protevus_serialize_generator.dart" builder_factories: - typescriptDefinitionBuilder auto_apply: root_package @@ -31,7 +31,7 @@ builders: # - "test/models/with_enum.dart" # $default: # dependencies: -# - "angel3_serialize_generator:_book" +# - "protevus_serialize_generator:_book" # sources: # - "test/models/author.dart" # - "test/models/game_pad.dart" diff --git a/packages/serialize/angel_serialize_generator/example/main.dart b/packages/serialize/serialize_generator/example/main.dart similarity index 66% rename from packages/serialize/angel_serialize_generator/example/main.dart rename to packages/serialize/serialize_generator/example/main.dart index a649a351..af4f59f8 100644 --- a/packages/serialize/angel_serialize_generator/example/main.dart +++ b/packages/serialize/serialize_generator/example/main.dart @@ -1,5 +1,5 @@ // ignore_for_file: unused_element -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'main.g.dart'; @serializable diff --git a/packages/serialize/angel_serialize_generator/example/main.g.dart b/packages/serialize/serialize_generator/example/main.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/example/main.g.dart rename to packages/serialize/serialize_generator/example/main.g.dart index 8df50c05..39aac61a 100644 --- a/packages/serialize/angel_serialize_generator/example/main.g.dart +++ b/packages/serialize/serialize_generator/example/main.g.dart @@ -75,8 +75,10 @@ class TodoSerializer extends Codec { @override TodoEncoder get encoder => const TodoEncoder(); + @override TodoDecoder get decoder => const TodoDecoder(); + static Todo fromMap(Map map) { return Todo( text: map['text'] as String?, completed: map['completed'] as bool?); diff --git a/packages/serialize/angel_serialize_generator/lib/build_context.dart b/packages/serialize/serialize_generator/lib/build_context.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/lib/build_context.dart rename to packages/serialize/serialize_generator/lib/build_context.dart index 00f7e6b1..9222aa1e 100644 --- a/packages/serialize/angel_serialize_generator/lib/build_context.dart +++ b/packages/serialize/serialize_generator/lib/build_context.dart @@ -4,7 +4,7 @@ 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:protevus_serialize/protevus_serialize.dart'; import 'package:build/build.dart'; import 'package:path/path.dart' as p; import 'package:recase/recase.dart'; diff --git a/packages/serialize/angel_serialize_generator/lib/context.dart b/packages/serialize/serialize_generator/lib/context.dart similarity index 98% rename from packages/serialize/angel_serialize_generator/lib/context.dart rename to packages/serialize/serialize_generator/lib/context.dart index 3952b08b..e32405ae 100644 --- a/packages/serialize/angel_serialize_generator/lib/context.dart +++ b/packages/serialize/serialize_generator/lib/context.dart @@ -1,7 +1,7 @@ import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:code_builder/code_builder.dart'; import 'package:recase/recase.dart'; import 'package:source_gen/source_gen.dart'; diff --git a/packages/serialize/angel_serialize_generator/lib/model.dart b/packages/serialize/serialize_generator/lib/model.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/lib/model.dart rename to packages/serialize/serialize_generator/lib/model.dart index 8588a423..0fb761ae 100644 --- a/packages/serialize/angel_serialize_generator/lib/model.dart +++ b/packages/serialize/serialize_generator/lib/model.dart @@ -1,4 +1,4 @@ -part of 'angel3_serialize_generator.dart'; +part of 'protevus_serialize_generator.dart'; class JsonModelGenerator extends GeneratorForAnnotation { const JsonModelGenerator(); diff --git a/packages/serialize/angel_serialize_generator/lib/angel3_serialize_generator.dart b/packages/serialize/serialize_generator/lib/protevus_serialize_generator.dart similarity index 96% rename from packages/serialize/angel_serialize_generator/lib/angel3_serialize_generator.dart rename to packages/serialize/serialize_generator/lib/protevus_serialize_generator.dart index 7dddddee..ff27666b 100644 --- a/packages/serialize/angel_serialize_generator/lib/angel3_serialize_generator.dart +++ b/packages/serialize/serialize_generator/lib/protevus_serialize_generator.dart @@ -1,4 +1,4 @@ -library angel3_serialize_generator; +library protevus_serialize_generator; import 'dart:async'; import 'dart:mirrors'; @@ -7,7 +7,7 @@ import 'package:analyzer/dart/constant/value.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'package:build/build.dart'; import 'package:belatuk_code_buffer/belatuk_code_buffer.dart'; import 'package:code_builder/code_builder.dart'; @@ -25,12 +25,12 @@ part 'serialize.dart'; part 'typescript.dart'; Builder jsonModelBuilder(_) { - return SharedPartBuilder(const [JsonModelGenerator()], 'angel3_serialize'); + return SharedPartBuilder(const [JsonModelGenerator()], 'protevus_serialize'); } Builder serializerBuilder(_) { return SharedPartBuilder( - const [SerializerGenerator()], 'angel3_serialize_serializer'); + const [SerializerGenerator()], 'protevus_serialize_serializer'); } Builder typescriptDefinitionBuilder(_) { diff --git a/packages/serialize/angel_serialize_generator/lib/serialize.dart b/packages/serialize/serialize_generator/lib/serialize.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/lib/serialize.dart rename to packages/serialize/serialize_generator/lib/serialize.dart index 5812d4a8..4f527b7c 100644 --- a/packages/serialize/angel_serialize_generator/lib/serialize.dart +++ b/packages/serialize/serialize_generator/lib/serialize.dart @@ -1,4 +1,4 @@ -part of 'angel3_serialize_generator.dart'; +part of 'protevus_serialize_generator.dart'; class SerializerGenerator extends GeneratorForAnnotation { final bool autoSnakeCaseNames; diff --git a/packages/serialize/angel_serialize_generator/lib/typescript.dart b/packages/serialize/serialize_generator/lib/typescript.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/lib/typescript.dart rename to packages/serialize/serialize_generator/lib/typescript.dart index 6aebfa81..6d62cab5 100644 --- a/packages/serialize/angel_serialize_generator/lib/typescript.dart +++ b/packages/serialize/serialize_generator/lib/typescript.dart @@ -1,4 +1,4 @@ -part of 'angel3_serialize_generator.dart'; +part of 'protevus_serialize_generator.dart'; class TypeScriptDefinitionBuilder implements Builder { final bool autoSnakeCaseNames; diff --git a/packages/serialize/angel_serialize_generator/pubspec.yaml b/packages/serialize/serialize_generator/pubspec.yaml similarity index 81% rename from packages/serialize/angel_serialize_generator/pubspec.yaml rename to packages/serialize/serialize_generator/pubspec.yaml index 770fe985..8373219e 100644 --- a/packages/serialize/angel_serialize_generator/pubspec.yaml +++ b/packages/serialize/serialize_generator/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_serialize_generator +name: protevus_serialize_generator version: 8.3.1 description: Protevus model serialization generators, designed for use with Protevus. Combine with angel_serialize for flexible modeling. homepage: https://protevus-framework.web.app/ @@ -7,8 +7,8 @@ environment: sdk: '>=3.3.0 <4.0.0' dependencies: analyzer: ^6.5.0 - angel3_model: ^8.2.0 - angel3_serialize: ^8.2.0 + protevus_model: ^8.2.0 + protevus_serialize: ^8.2.0 belatuk_code_buffer: ^5.2.0 build: ^2.0.1 build_config: ^1.0.0 @@ -25,7 +25,7 @@ dev_dependencies: lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_model: +# protevus_model: # path: ../../model -# angel3_serialize: -# path: ../angel_serialize +# protevus_serialize: +# path: ../protevus_serialize diff --git a/packages/serialize/angel_serialize_generator/test/book_test.dart b/packages/serialize/serialize_generator/test/book_test.dart similarity index 100% rename from packages/serialize/angel_serialize_generator/test/book_test.dart rename to packages/serialize/serialize_generator/test/book_test.dart diff --git a/packages/serialize/angel_serialize_generator/test/default_value_test.dart b/packages/serialize/serialize_generator/test/default_value_test.dart similarity index 100% rename from packages/serialize/angel_serialize_generator/test/default_value_test.dart rename to packages/serialize/serialize_generator/test/default_value_test.dart diff --git a/packages/serialize/angel_serialize_generator/test/enum_test.dart b/packages/serialize/serialize_generator/test/enum_test.dart similarity index 100% rename from packages/serialize/angel_serialize_generator/test/enum_test.dart rename to packages/serialize/serialize_generator/test/enum_test.dart diff --git a/packages/serialize/angel_serialize_generator/test/models/book.d.ts b/packages/serialize/serialize_generator/test/models/book.d.ts similarity index 94% rename from packages/serialize/angel_serialize_generator/test/models/book.d.ts rename to packages/serialize/serialize_generator/test/models/book.d.ts index 97f19f78..f0185141 100644 --- a/packages/serialize/angel_serialize_generator/test/models/book.d.ts +++ b/packages/serialize/serialize_generator/test/models/book.d.ts @@ -1,5 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -declare module 'angel3_serialize_generator' { +declare module 'protevus_serialize_generator' { interface Book { id?: string; created_at?: any; diff --git a/packages/serialize/angel_serialize_generator/test/models/book.dart b/packages/serialize/serialize_generator/test/models/book.dart similarity index 95% rename from packages/serialize/angel_serialize_generator/test/models/book.dart rename to packages/serialize/serialize_generator/test/models/book.dart index db22c5b4..aa207219 100644 --- a/packages/serialize/angel_serialize_generator/test/models/book.dart +++ b/packages/serialize/serialize_generator/test/models/book.dart @@ -1,6 +1,6 @@ library angel_serialize.test.models.book; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'book.g.dart'; @Serializable( diff --git a/packages/serialize/angel_serialize_generator/test/models/book.g.dart b/packages/serialize/serialize_generator/test/models/book.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/book.g.dart rename to packages/serialize/serialize_generator/test/models/book.g.dart index 3ab37a3d..9bca1794 100644 --- a/packages/serialize/angel_serialize_generator/test/models/book.g.dart +++ b/packages/serialize/serialize_generator/test/models/book.g.dart @@ -404,8 +404,10 @@ class BookSerializer extends Codec { @override BookEncoder get encoder => const BookEncoder(); + @override BookDecoder get decoder => const BookDecoder(); + static Book fromMap(Map map) { return Book( id: map['id'] as String?, @@ -500,8 +502,10 @@ class AuthorSerializer extends Codec { @override AuthorEncoder get encoder => const AuthorEncoder(); + @override AuthorDecoder get decoder => const AuthorDecoder(); + static Author fromMap(Map map) { if (map['name'] == null) { throw FormatException("Missing required field 'name' on Author."); @@ -604,8 +608,10 @@ class LibrarySerializer extends Codec { @override LibraryEncoder get encoder => const LibraryEncoder(); + @override LibraryDecoder get decoder => const LibraryDecoder(); + static Library fromMap(Map map) { return Library( id: map['id'] as String?, diff --git a/packages/serialize/angel_serialize_generator/test/models/character.dart b/packages/serialize/serialize_generator/test/models/character.dart similarity index 100% rename from packages/serialize/angel_serialize_generator/test/models/character.dart rename to packages/serialize/serialize_generator/test/models/character.dart diff --git a/packages/serialize/angel_serialize_generator/test/models/droid.dart b/packages/serialize/serialize_generator/test/models/droid.dart similarity index 72% rename from packages/serialize/angel_serialize_generator/test/models/droid.dart rename to packages/serialize/serialize_generator/test/models/droid.dart index 35207673..a87fe5f9 100644 --- a/packages/serialize/angel_serialize_generator/test/models/droid.dart +++ b/packages/serialize/serialize_generator/test/models/droid.dart @@ -1,4 +1,4 @@ -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; import 'character.dart'; diff --git a/packages/serialize/angel_serialize_generator/test/models/droid.g.dart b/packages/serialize/serialize_generator/test/models/droid.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/droid.g.dart rename to packages/serialize/serialize_generator/test/models/droid.g.dart index d1a1bd1f..cdc279f8 100644 --- a/packages/serialize/angel_serialize_generator/test/models/droid.g.dart +++ b/packages/serialize/serialize_generator/test/models/droid.g.dart @@ -112,8 +112,10 @@ class DroidSerializer extends Codec { @override DroidEncoder get encoder => const DroidEncoder(); + @override DroidDecoder get decoder => const DroidDecoder(); + static Droid fromMap(Map map) { return Droid( id: map['id'] as String?, diff --git a/packages/serialize/angel_serialize_generator/test/models/game_pad_button.dart b/packages/serialize/serialize_generator/test/models/game_pad_button.dart similarity index 82% rename from packages/serialize/angel_serialize_generator/test/models/game_pad_button.dart rename to packages/serialize/serialize_generator/test/models/game_pad_button.dart index c8f010d0..d5c63a95 100644 --- a/packages/serialize/angel_serialize_generator/test/models/game_pad_button.dart +++ b/packages/serialize/serialize_generator/test/models/game_pad_button.dart @@ -1,4 +1,4 @@ -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'game_pad_button.g.dart'; @serializable diff --git a/packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart b/packages/serialize/serialize_generator/test/models/game_pad_button.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart rename to packages/serialize/serialize_generator/test/models/game_pad_button.g.dart index 5206a1dc..a77e07c1 100644 --- a/packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart +++ b/packages/serialize/serialize_generator/test/models/game_pad_button.g.dart @@ -129,8 +129,10 @@ class GamepadButtonSerializer extends Codec { @override GamepadButtonEncoder get encoder => const GamepadButtonEncoder(); + @override GamepadButtonDecoder get decoder => const GamepadButtonDecoder(); + static GamepadButton fromMap(Map map) { return GamepadButton( name: map['name'] as String?, radius: map['radius'] as int?); @@ -176,8 +178,10 @@ class GamepadSerializer extends Codec { @override GamepadEncoder get encoder => const GamepadEncoder(); + @override GamepadDecoder get decoder => const GamepadDecoder(); + static Gamepad fromMap(Map map) { return Gamepad( buttons: map['buttons'] is Iterable diff --git a/packages/serialize/angel_serialize_generator/test/models/goat.dart b/packages/serialize/serialize_generator/test/models/goat.dart similarity index 75% rename from packages/serialize/angel_serialize_generator/test/models/goat.dart rename to packages/serialize/serialize_generator/test/models/goat.dart index 79152280..00d2271a 100644 --- a/packages/serialize/angel_serialize_generator/test/models/goat.dart +++ b/packages/serialize/serialize_generator/test/models/goat.dart @@ -1,4 +1,4 @@ -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'goat.g.dart'; @serializable diff --git a/packages/serialize/angel_serialize_generator/test/models/goat.g.dart b/packages/serialize/serialize_generator/test/models/goat.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/goat.g.dart rename to packages/serialize/serialize_generator/test/models/goat.g.dart index 91fe0c5e..1dca55e2 100644 --- a/packages/serialize/angel_serialize_generator/test/models/goat.g.dart +++ b/packages/serialize/serialize_generator/test/models/goat.g.dart @@ -76,8 +76,10 @@ class GoatSerializer extends Codec { @override GoatEncoder get encoder => const GoatEncoder(); + @override GoatDecoder get decoder => const GoatDecoder(); + static Goat fromMap(Map map) { return Goat( integer: map['integer'] as int? ?? 34, diff --git a/packages/serialize/angel_serialize_generator/test/models/has_map.dart b/packages/serialize/serialize_generator/test/models/has_map.dart similarity index 84% rename from packages/serialize/angel_serialize_generator/test/models/has_map.dart rename to packages/serialize/serialize_generator/test/models/has_map.dart index b335c187..9b98855d 100644 --- a/packages/serialize/angel_serialize_generator/test/models/has_map.dart +++ b/packages/serialize/serialize_generator/test/models/has_map.dart @@ -1,4 +1,4 @@ -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'has_map.g.dart'; Map? _fromString(v) => json.decode(v.toString()) as Map?; diff --git a/packages/serialize/angel_serialize_generator/test/models/has_map.g.dart b/packages/serialize/serialize_generator/test/models/has_map.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/has_map.g.dart rename to packages/serialize/serialize_generator/test/models/has_map.g.dart index 8f9482d1..133af61e 100644 --- a/packages/serialize/angel_serialize_generator/test/models/has_map.g.dart +++ b/packages/serialize/serialize_generator/test/models/has_map.g.dart @@ -65,8 +65,10 @@ class HasMapSerializer extends Codec { @override HasMapEncoder get encoder => const HasMapEncoder(); + @override HasMapDecoder get decoder => const HasMapDecoder(); + static HasMap fromMap(Map map) { if (map['value'] == null) { throw FormatException("Missing required field 'value' on HasMap."); diff --git a/packages/serialize/angel_serialize_generator/test/models/subclass.dart b/packages/serialize/serialize_generator/test/models/subclass.dart similarity index 82% rename from packages/serialize/angel_serialize_generator/test/models/subclass.dart rename to packages/serialize/serialize_generator/test/models/subclass.dart index b1d4e8e0..93475159 100644 --- a/packages/serialize/angel_serialize_generator/test/models/subclass.dart +++ b/packages/serialize/serialize_generator/test/models/subclass.dart @@ -1,4 +1,4 @@ -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'subclass.g.dart'; @serializable diff --git a/packages/serialize/angel_serialize_generator/test/models/subclass.g.dart b/packages/serialize/serialize_generator/test/models/subclass.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/subclass.g.dart rename to packages/serialize/serialize_generator/test/models/subclass.g.dart index a721a9e6..4de61493 100644 --- a/packages/serialize/angel_serialize_generator/test/models/subclass.g.dart +++ b/packages/serialize/serialize_generator/test/models/subclass.g.dart @@ -129,8 +129,10 @@ class AnimalSerializer extends Codec { @override AnimalEncoder get encoder => const AnimalEncoder(); + @override AnimalDecoder get decoder => const AnimalDecoder(); + static Animal fromMap(Map map) { if (map['genus'] == null) { throw FormatException("Missing required field 'genus' on Animal."); @@ -184,8 +186,10 @@ class BirdSerializer extends Codec { @override BirdEncoder get encoder => const BirdEncoder(); + @override BirdDecoder get decoder => const BirdDecoder(); + static Bird fromMap(Map map) { if (map['genus'] == null) { throw FormatException("Missing required field 'genus' on Bird."); diff --git a/packages/serialize/angel_serialize_generator/test/models/with_enum.dart b/packages/serialize/serialize_generator/test/models/with_enum.dart similarity index 81% rename from packages/serialize/angel_serialize_generator/test/models/with_enum.dart rename to packages/serialize/serialize_generator/test/models/with_enum.dart index eb92923a..36c3c9e1 100644 --- a/packages/serialize/angel_serialize_generator/test/models/with_enum.dart +++ b/packages/serialize/serialize_generator/test/models/with_enum.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:protevus_serialize/protevus_serialize.dart'; part 'with_enum.g.dart'; @serializable diff --git a/packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart b/packages/serialize/serialize_generator/test/models/with_enum.g.dart similarity index 99% rename from packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart rename to packages/serialize/serialize_generator/test/models/with_enum.g.dart index a13d13b6..b470b22e 100644 --- a/packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart +++ b/packages/serialize/serialize_generator/test/models/with_enum.g.dart @@ -87,8 +87,10 @@ class WithEnumSerializer extends Codec { @override WithEnumEncoder get encoder => const WithEnumEncoder(); + @override WithEnumDecoder get decoder => const WithEnumDecoder(); + static WithEnum fromMap(Map map) { return WithEnum( type: map['type'] as WithEnumType? ?? WithEnumType.b, diff --git a/packages/serialize/angel_serialize_generator/test/serializer_test.dart b/packages/serialize/serialize_generator/test/serializer_test.dart similarity index 100% rename from packages/serialize/angel_serialize_generator/test/serializer_test.dart rename to packages/serialize/serialize_generator/test/serializer_test.dart diff --git a/packages/shelf/README.md b/packages/shelf/README.md index cc15470b..4d27bd13 100644 --- a/packages/shelf/README.md +++ b/packages/shelf/README.md @@ -1,6 +1,6 @@ # Protevus Shelf -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_shelf?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_shelf?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/protevus/tree/master/packages/shelf/LICENSE) @@ -24,8 +24,8 @@ or attach it to individual routes. ```dart import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_shelf/angel3_shelf.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_shelf/protevus_shelf.dart'; import 'package:shelf/shelf.dart' as shelf; import 'api/api.dart'; diff --git a/packages/shelf/example/angel_in_shelf.dart b/packages/shelf/example/angel_in_shelf.dart index 681c5d11..b20f5b5b 100644 --- a/packages/shelf/example/angel_in_shelf.dart +++ b/packages/shelf/example/angel_in_shelf.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_shelf/angel3_shelf.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_shelf/protevus_shelf.dart'; import 'package:logging/logging.dart'; import 'package:belatuk_pretty_logging/belatuk_pretty_logging.dart'; import 'package:shelf/shelf.dart' as shelf; @@ -15,7 +15,7 @@ void main() async { // Create a basic Protevus server, with some routes. var app = Protevus( - logger: Logger('angel3_shelf_demo'), + logger: Logger('protevus_shelf_demo'), reflector: MirrorsReflector(), ); diff --git a/packages/shelf/example/main.dart b/packages/shelf/example/main.dart index 3cce8dad..3df430b8 100644 --- a/packages/shelf/example/main.dart +++ b/packages/shelf/example/main.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_shelf/angel3_shelf.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_shelf/protevus_shelf.dart'; import 'package:logging/logging.dart'; import 'package:belatuk_pretty_logging/belatuk_pretty_logging.dart'; import 'package:shelf_static/shelf_static.dart'; @@ -11,7 +11,7 @@ void main() async { ..level = Level.ALL ..onRecord.listen(prettyLog); - var app = Protevus(logger: Logger('angel3_shelf_demo')); + var app = Protevus(logger: Logger('protevus_shelf_demo')); var http = ProtevusHttp(app); // `shelf` request handler @@ -23,7 +23,7 @@ void main() async { // A normal Protevus route. app.get('/protevus', (req, ResponseContext res) { - res.write('Hooray for `package:angel3_shelf`!'); + res.write('Hooray for `package:protevus_shelf`!'); return false; // End execution of handlers, so we don't proxy to dartlang.org when we don't need to. }); diff --git a/packages/shelf/lib/angel3_shelf.dart b/packages/shelf/lib/protevus_shelf.dart similarity index 100% rename from packages/shelf/lib/angel3_shelf.dart rename to packages/shelf/lib/protevus_shelf.dart diff --git a/packages/shelf/lib/src/convert.dart b/packages/shelf/lib/src/convert.dart index 9f23a23a..651f2424 100644 --- a/packages/shelf/lib/src/convert.dart +++ b/packages/shelf/lib/src/convert.dart @@ -1,16 +1,16 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:path/path.dart' as p; import 'package:shelf/shelf.dart' as shelf; import 'package:stream_channel/stream_channel.dart'; /// Creates a [shelf.Request] analogous to the input [req]. /// -/// The request's `context` will contain [req.container] as `angel3_shelf.container`, as well as +/// The request's `context` will contain [req.container] as `protevus_shelf.container`, as well as /// the provided [context], if any. /// -/// The context will also have the original request available as `angel3_shelf.request`. +/// The context will also have the original request available as `protevus_shelf.request`. /// /// If you want to read the request body, you *must* set `keepRawRequestBuffers` to `true` /// on your application instance. @@ -64,8 +64,8 @@ Future convertRequest(RequestContext req, ResponseContext res, handlerPath: handlerPath, url: url, body: req.body, - context: {'angel3_shelf.request': req} - ..addAll({'angel3_shelf.container': req.container!}) + context: {'protevus_shelf.request': req} + ..addAll({'protevus_shelf.container': req.container!}) ..addAll(context ?? {}), onHijack: onHijack); } diff --git a/packages/shelf/lib/src/embed_shelf.dart b/packages/shelf/lib/src/embed_shelf.dart index 21f4ab71..8ee7c868 100644 --- a/packages/shelf/lib/src/embed_shelf.dart +++ b/packages/shelf/lib/src/embed_shelf.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:shelf/shelf.dart' as shelf; import 'convert.dart'; diff --git a/packages/shelf/lib/src/shelf_driver.dart b/packages/shelf/lib/src/shelf_driver.dart index 6b09bda4..d7af77c8 100644 --- a/packages/shelf/lib/src/shelf_driver.dart +++ b/packages/shelf/lib/src/shelf_driver.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:shelf/shelf.dart' as shelf; import 'package:shelf/shelf.dart'; import 'shelf_request.dart'; diff --git a/packages/shelf/lib/src/shelf_request.dart b/packages/shelf/lib/src/shelf_request.dart index 4ee806e6..4a211a61 100644 --- a/packages/shelf/lib/src/shelf_request.dart +++ b/packages/shelf/lib/src/shelf_request.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:angel3_container/angel3_container.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_container/protevus_container.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:shelf/shelf.dart' as shelf; class ShelfRequestContext extends RequestContext { diff --git a/packages/shelf/lib/src/shelf_response.dart b/packages/shelf/lib/src/shelf_response.dart index 7a31c0f5..425cb83f 100644 --- a/packages/shelf/lib/src/shelf_response.dart +++ b/packages/shelf/lib/src/shelf_response.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:typed_data'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:shelf/shelf.dart' as shelf; import 'shelf_request.dart'; diff --git a/packages/shelf/pubspec.yaml b/packages/shelf/pubspec.yaml index def39a05..5da3c6f0 100644 --- a/packages/shelf/pubspec.yaml +++ b/packages/shelf/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_shelf +name: protevus_shelf version: 8.0.0-beta.1 description: Shelf interop with Protevus. Use this to wrap existing server code. homepage: https://protevus-framework.web.app/ @@ -7,9 +7,9 @@ environment: sdk: '>=3.3.0 <4.0.0' publish_to: none dependencies: - angel3_framework: ^8.4.0 - angel3_container: ^8.2.0 - angel3_mock_request: ^8.2.0 + protevus_framework: ^8.4.0 + protevus_container: ^8.2.0 + protevus_mock_request: ^8.2.0 path: ^1.9.0 shelf: ^1.3.0 stream_channel: ^2.1.0 @@ -17,31 +17,31 @@ dependencies: charcode: ^1.3.0 http: ^1.0.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 belatuk_pretty_logging: ^6.1.0 shelf_static: ^1.1.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_test: +# protevus_test: # path: ../test -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_validate: +# protevus_validate: # path: ../validate diff --git a/packages/shelf/test/embed_shelf_test.dart b/packages/shelf/test/embed_shelf_test.dart index 22f48277..66b88fd8 100644 --- a/packages/shelf/test/embed_shelf_test.dart +++ b/packages/shelf/test/embed_shelf_test.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_shelf/angel3_shelf.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_shelf/protevus_shelf.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:charcode/charcode.dart'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; @@ -51,7 +51,7 @@ void main() { } }); - var logger = Logger.detached('angel3_shelf')..onRecord.listen(prettyLog); + var logger = Logger.detached('protevus_shelf')..onRecord.listen(prettyLog); var app = Protevus(logger: logger, reflector: MirrorsReflector()); var httpDriver = ProtevusHttp(app); app.get('/protevus', (req, res) => 'Protevus'); diff --git a/packages/static/README.md b/packages/static/README.md index 59c205a9..3df7fae9 100644 --- a/packages/static/README.md +++ b/packages/static/README.md @@ -1,6 +1,6 @@ # Protevus Static Files Handler -[![version](https://img.shields.io/badge/pub-v4.1.0-brightgreen)](https://pub.dev/packages/angel3_static) +[![version](https://img.shields.io/badge/pub-v4.1.0-brightgreen)](https://pub.dev/packages/protevus_static) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/protevus/tree/protevus/packages/static/LICENSE) @@ -13,17 +13,17 @@ In `pubspec.yaml`: ```yaml dependencies: - angel3_static: ^8.0.0 + protevus_static: ^8.0.0 ``` ## Usage -To serve files from a directory, you need to create a `VirtualDirectory`. Keep in mind that `angel3_static` uses `package:file` instead of `dart:io`. +To serve files from a directory, you need to create a `VirtualDirectory`. Keep in mind that `protevus_static` uses `package:file` instead of `dart:io`. ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; void main() async { @@ -67,6 +67,6 @@ The `VirtualDirectory` API accepts a few named parameters: `build/web` (in production), depending on your `ANGEL_ENV`. - **indexFileNames**: A `List` of filenames that should be served as index pages. Default is `['index.html']`. - **publicPath**: To serve index files, you need to specify the virtual path under which - angel3_static is serving your files. If you are not serving static files at the site root, + protevus_static is serving your files. If you are not serving static files at the site root, please include this. - **callback**: Runs before sending a file to a client. Use this to set headers, etc. If it returns anything other than `null` or `true`, then the callback's result will be sent to the user, instead of the file contents. diff --git a/packages/static/example/main.dart b/packages/static/example/main.dart index 37e2bca6..dc06e41d 100644 --- a/packages/static/example/main.dart +++ b/packages/static/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/static/lib/angel3_static.dart b/packages/static/lib/protevus_static.dart similarity index 100% rename from packages/static/lib/angel3_static.dart rename to packages/static/lib/protevus_static.dart diff --git a/packages/static/lib/src/cache.dart b/packages/static/lib/src/cache.dart index bc943bdd..5a8f49bb 100644 --- a/packages/static/lib/src/cache.dart +++ b/packages/static/lib/src/cache.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:io' show HttpDate; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/file.dart'; import 'package:logging/logging.dart'; import 'virtual_directory.dart'; diff --git a/packages/static/lib/src/virtual_directory.dart b/packages/static/lib/src/virtual_directory.dart index 696cb68b..80386ce9 100644 --- a/packages/static/lib/src/virtual_directory.dart +++ b/packages/static/lib/src/virtual_directory.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:file/file.dart'; import 'package:http_parser/http_parser.dart'; import 'package:path/path.dart' as p; diff --git a/packages/static/pubspec.yaml b/packages/static/pubspec.yaml index 9a938903..ba5cf86e 100644 --- a/packages/static/pubspec.yaml +++ b/packages/static/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_static +name: protevus_static version: 8.2.1 description: This library provides a virtual directory to serve static files for Protevus framework. homepage: https://protevus-framework.web.app/ @@ -6,7 +6,7 @@ repository: https://github.com/dart-backend/protevus/tree/protevus/packages/stat environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.4.0 + protevus_framework: ^8.4.0 belatuk_range_header: ^6.1.0 convert: ^3.0.0 crypto: ^3.0.1 @@ -15,32 +15,32 @@ dependencies: path: ^1.9.0 logging: ^1.2.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 http: ^1.0.0 matcher: ^0.12.10 lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_validate: +# protevus_validate: # path: ../validate -# angel3_test: +# protevus_test: # path: ../test diff --git a/packages/static/test/all_test.dart b/packages/static/test/all_test.dart index 6ef43f91..8e815ead 100644 --- a/packages/static/test/all_test.dart +++ b/packages/static/test/all_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; import 'package:http/http.dart' show Client; import 'package:logging/logging.dart'; diff --git a/packages/static/test/cache_sample.dart b/packages/static/test/cache_sample.dart index 29f80b0b..f63c61e9 100644 --- a/packages/static/test/cache_sample.dart +++ b/packages/static/test/cache_sample.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; void main() async { diff --git a/packages/static/test/cache_test.dart b/packages/static/test/cache_test.dart index 6b2a0720..02d3fe8c 100644 --- a/packages/static/test/cache_test.dart +++ b/packages/static/test/cache_test.dart @@ -1,7 +1,7 @@ import 'dart:io' show HttpDate; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_static/angel3_static.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_static/protevus_static.dart'; import 'package:file/local.dart'; import 'package:http/http.dart' show Client; import 'package:logging/logging.dart'; diff --git a/packages/static/test/issue41_test.dart b/packages/static/test/issue41_test.dart index 151460e7..2f4bd9ff 100644 --- a/packages/static/test/issue41_test.dart +++ b/packages/static/test/issue41_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_static/angel3_static.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_static/protevus_static.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:file/file.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/static/test/push_state_test.dart b/packages/static/test/push_state_test.dart index d8bc5b03..a98ec3a6 100644 --- a/packages/static/test/push_state_test.dart +++ b/packages/static/test/push_state_test.dart @@ -1,6 +1,6 @@ -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_static/angel3_static.dart'; -import 'package:angel3_test/angel3_test.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_static/protevus_static.dart'; +import 'package:protevus_test/protevus_test.dart'; import 'package:file/memory.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart'; diff --git a/packages/sync/README.md b/packages/sync/README.md index a7cb6919..9a815154 100644 --- a/packages/sync/README.md +++ b/packages/sync/README.md @@ -1,6 +1,6 @@ # Protevus Sync -[![version](https://img.shields.io/badge/pub-v4.1.1-brightgreen)](https://pub.dev/packages/angel3_sync) +[![version](https://img.shields.io/badge/pub-v4.1.1-brightgreen)](https://pub.dev/packages/protevus_sync) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/protevus/tree/protevus/packages/sync/LICENSE) diff --git a/packages/sync/example/main.dart b/packages/sync/example/main.dart index d83b41d9..2f85847f 100644 --- a/packages/sync/example/main.dart +++ b/packages/sync/example/main.dart @@ -1,10 +1,10 @@ import 'dart:isolate'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_sync/angel3_sync.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_websocket/io.dart' as client; -import 'package:angel3_websocket/server.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_sync/protevus_sync.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_websocket/io.dart' as client; +import 'package:protevus_websocket/server.dart'; import 'package:belatuk_pub_sub/isolate.dart' as pub_sub; import 'package:belatuk_pub_sub/belatuk_pub_sub.dart' as pub_sub; import 'package:test/test.dart'; diff --git a/packages/sync/lib/angel3_sync.dart b/packages/sync/lib/protevus_sync.dart similarity index 96% rename from packages/sync/lib/angel3_sync.dart rename to packages/sync/lib/protevus_sync.dart index e9cc4e05..2a817f79 100644 --- a/packages/sync/lib/angel3_sync.dart +++ b/packages/sync/lib/protevus_sync.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_websocket/angel3_websocket.dart'; +import 'package:protevus_websocket/protevus_websocket.dart'; import 'package:belatuk_pub_sub/belatuk_pub_sub.dart' as pub_sub; import 'package:stream_channel/stream_channel.dart'; diff --git a/packages/sync/pubspec.yaml b/packages/sync/pubspec.yaml index e32173fd..05ed650d 100644 --- a/packages/sync/pubspec.yaml +++ b/packages/sync/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_sync +name: protevus_sync version: 8.2.0 description: Easily synchronize and scale WebSockets using belatuk_pub_sub in Protevus. homepage: https://protevus-framework.web.app/ @@ -6,34 +6,34 @@ repository: https://github.com/dart-backend/protevus/tree/protevus/packages/sync environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 - angel3_websocket: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_websocket: ^8.0.0 belatuk_pub_sub: ^6.1.0 stream_channel: ^2.1.0 dev_dependencies: - angel3_test: ^8.0.0 + protevus_test: ^8.0.0 test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_test: +# protevus_test: # path: ../test -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/sync/test/all_test.dart b/packages/sync/test/all_test.dart index 3fedf95d..b7ad8ae9 100644 --- a/packages/sync/test/all_test.dart +++ b/packages/sync/test/all_test.dart @@ -1,10 +1,10 @@ import 'dart:isolate'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_sync/angel3_sync.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_websocket/io.dart' as client; -import 'package:angel3_websocket/server.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_sync/protevus_sync.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_websocket/io.dart' as client; +import 'package:protevus_websocket/server.dart'; import 'package:belatuk_pub_sub/isolate.dart' as pub_sub; import 'package:belatuk_pub_sub/belatuk_pub_sub.dart' as pub_sub; import 'package:test/test.dart'; diff --git a/packages/test/README.md b/packages/test/README.md index a4da50d2..f2522970 100644 --- a/packages/test/README.md +++ b/packages/test/README.md @@ -1,6 +1,6 @@ # Protevus Test -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_test?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_test?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/test/LICENSE) @@ -9,7 +9,7 @@ Testing utility library for Protevus framework. ## TestClient -The `TestClient` class is a custom `angel3_client` that sends mock requests to your server. This means that you will not have to bind your server to HTTP to run. Plus, it is an `angel3_client`, and thus supports services and other goodies. The `TestClient` also supports WebSockets. WebSockets cannot be mocked (yet!) within this library, so calling the `websocket()` function will also bind your server to HTTP, if it is not already listening. The return value is a `WebSockets` client instance (from [`package:angel3_websocket`]()); +The `TestClient` class is a custom `protevus_client` that sends mock requests to your server. This means that you will not have to bind your server to HTTP to run. Plus, it is an `protevus_client`, and thus supports services and other goodies. The `TestClient` also supports WebSockets. WebSockets cannot be mocked (yet!) within this library, so calling the `websocket()` function will also bind your server to HTTP, if it is not already listening. The return value is a `WebSockets` client instance (from [`package:protevus_websocket`]()); ```dart var ws = await client.websocket('/ws'); @@ -46,7 +46,7 @@ void test('error', () async { }); ``` -`hasValidBody` is one of the most powerful `Matcher`s in this library, because it allows you to validate a JSON body against a validation schema. Protevus provides a comprehensive [validation library]() that integrates tightly with the `matcher` package that you already use for testing. +`hasValidBody` is one of the most powerful `Matcher`s in this library, because it allows you to validate a JSON body against a validation schema. Protevus provides a comprehensive [validation library]() that integrates tightly with the `matcher` package that you already use for testing. ```dart test('validate response', () async { diff --git a/packages/test/example/main.dart b/packages/test/example/main.dart index da4382e0..92c6d9ad 100644 --- a/packages/test/example/main.dart +++ b/packages/test/example/main.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_validate/angel3_validate.dart'; -import 'package:angel3_websocket/server.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_validate/protevus_validate.dart'; +import 'package:protevus_websocket/server.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/test/lib/angel3_test.dart b/packages/test/lib/protevus_test.dart similarity index 100% rename from packages/test/lib/angel3_test.dart rename to packages/test/lib/protevus_test.dart diff --git a/packages/test/lib/src/client.dart b/packages/test/lib/src/client.dart index 0901e42a..4716bed8 100644 --- a/packages/test/lib/src/client.dart +++ b/packages/test/lib/src/client.dart @@ -1,14 +1,14 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:angel3_client/base_angel_client.dart' as client; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; -import 'package:angel3_websocket/io.dart' as client; +import 'package:protevus_client/base_protevus_client.dart' as client; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +import 'package:protevus_websocket/io.dart' as client; import 'package:http/http.dart' as http hide StreamedResponse; import 'package:http/http.dart'; import 'package:http/io_client.dart' as http; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; import 'package:web_socket_channel/io.dart'; //import 'package:uuid/uuid.dart'; diff --git a/packages/test/lib/src/matchers.dart b/packages/test/lib/src/matchers.dart index c56f3f27..e7e9ddad 100644 --- a/packages/test/lib/src/matchers.dart +++ b/packages/test/lib/src/matchers.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:io'; import 'package:http/http.dart' as http; -import 'package:angel3_http_exception/angel3_http_exception.dart'; -import 'package:angel3_validate/angel3_validate.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; +import 'package:protevus_validate/protevus_validate.dart'; /// Expects a response to be a JSON representation of an `ProtevusHttpException`. /// diff --git a/packages/test/pubspec.yaml b/packages/test/pubspec.yaml index 4cc6a600..f605aefe 100644 --- a/packages/test/pubspec.yaml +++ b/packages/test/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_test +name: protevus_test version: 8.2.1 description: Testing utility library for the Protevus framework. Use with package:test. homepage: https://protevus-framework.web.app/ @@ -6,13 +6,13 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/test environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_client: ^8.2.0 - angel3_framework: ^8.4.0 - angel3_http_exception: ^8.2.0 - angel3_validate: ^8.2.0 - angel3_websocket: ^8.2.0 - angel3_mock_request: ^8.0.0 - angel3_container: ^8.0.0 + protevus_client: ^8.2.0 + protevus_framework: ^8.4.0 + protevus_http_exception: ^8.2.0 + protevus_validate: ^8.2.0 + protevus_websocket: ^8.2.0 + protevus_mock_request: ^8.0.0 + protevus_container: ^8.0.0 http: ^1.0.0 matcher: ^0.12.0 web_socket_channel: ^3.0.0 @@ -20,23 +20,23 @@ dev_dependencies: test: ^1.24.0 lints: ^4.0.0 # dependency_overrides: -# angel3_validate: +# protevus_validate: # path: ../validate -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request -# angel3_auth: +# protevus_auth: # path: ../auth -# angel3_client: +# protevus_client: # path: ../client -# angel3_websocket: +# protevus_websocket: # path: ../websocket -# angel3_validate: +# protevus_validate: # path: ../validate \ No newline at end of file diff --git a/packages/test/test/simple_test.dart b/packages/test/test/simple_test.dart index 97b45bac..1a5f5203 100644 --- a/packages/test/test/simple_test.dart +++ b/packages/test/test/simple_test.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'dart:io'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_container/mirrors.dart'; -import 'package:angel3_test/angel3_test.dart'; -import 'package:angel3_validate/angel3_validate.dart'; -import 'package:angel3_websocket/server.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_container/mirrors.dart'; +import 'package:protevus_test/protevus_test.dart'; +import 'package:protevus_validate/protevus_validate.dart'; +import 'package:protevus_websocket/server.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/user_agent/angel_user_agent/README.md b/packages/user_agent/angel_user_agent/README.md index bef4d56f..64a8d632 100644 --- a/packages/user_agent/angel_user_agent/README.md +++ b/packages/user_agent/angel_user_agent/README.md @@ -1,6 +1,6 @@ # Protevus User Agent -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_user_agent?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_user_agent?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/protevus/tree/protevus/packages/user_agent/angel_user_agent/LICENSE) diff --git a/packages/user_agent/angel_user_agent/example/example.dart b/packages/user_agent/angel_user_agent/example/example.dart index 85049bfc..b8808f37 100644 --- a/packages/user_agent/angel_user_agent/example/example.dart +++ b/packages/user_agent/angel_user_agent/example/example.dart @@ -1,7 +1,7 @@ //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:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; +//import 'package:protevus_user_agent/protevus_user_agent.dart'; //import 'package:user_agent_analyzer/user_agent_analyzer.dart'; void main() async { diff --git a/packages/user_agent/angel_user_agent/lib/angel3_user_agent.dart b/packages/user_agent/angel_user_agent/lib/angel3_user_agent.dart index 819f0fca..7b57ce75 100644 --- a/packages/user_agent/angel_user_agent/lib/angel3_user_agent.dart +++ b/packages/user_agent/angel_user_agent/lib/angel3_user_agent.dart @@ -1,4 +1,4 @@ -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:user_agent_analyzer/user_agent_analyzer.dart'; /// Injects a [UserAgent] factory into requests. diff --git a/packages/user_agent/angel_user_agent/pubspec.yaml b/packages/user_agent/angel_user_agent/pubspec.yaml index 8b4776c2..4260770b 100644 --- a/packages/user_agent/angel_user_agent/pubspec.yaml +++ b/packages/user_agent/angel_user_agent/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_user_agent +name: protevus_user_agent version: 8.2.0 description: Protevus middleware to parse and inject a User Agent object into requests. homepage: https://protevus-framework.web.app/ @@ -6,19 +6,19 @@ repository: https://github.com/dart-backend/protevus/tree/protevus/packages/user environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 + protevus_framework: ^8.0.0 user_agent_analyzer: ^5.0.0 lints: ^4.0.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../../container/angel_container -# angel3_http_exception: +# protevus_http_exception: # path: ../../http_exception -# angel3_model: +# protevus_model: # path: ../../model -# angel3_route: +# protevus_route: # path: ../../route -# angel3_mock_request: +# protevus_mock_request: # path: ../../mock_request -# angel3_framework: +# protevus_framework: # path: ../../framework \ No newline at end of file diff --git a/packages/validate/README.md b/packages/validate/README.md index 67b8cefa..3645045a 100644 --- a/packages/validate/README.md +++ b/packages/validate/README.md @@ -1,6 +1,6 @@ # Protevus Validate -![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_validate?include_prereleases) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/protevus_validate?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Discord](https://img.shields.io/discord/1060322353214660698)](https://discord.gg/3X6bxTUdCM) [![License](https://img.shields.io/github/license/dart-backend/protevus)](https://github.com/dart-backend/protevus/tree/master/packages/validate/LICENSE) @@ -30,7 +30,7 @@ For convenience's sake, this library also exports `matcher`. ### Creating a Validator ```dart -import 'package:angel3_validate/angel3_validate.dart'; +import 'package:protevus_validate/protevus_validate.dart'; main() { var validator = Validator({ @@ -131,7 +131,7 @@ main() { ### Custom Error Messages -If these are not present, `angel3_validate` will *attempt* to generate a coherent error message on its own. +If these are not present, `protevus_validate` will *attempt* to generate a coherent error message on its own. ```dart Validator({ @@ -269,8 +269,8 @@ main() { - `filterQuery(only)`: Same as `filterBody`, but operates on `req.query`. ```dart -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_validate/server.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_validate/server.dart'; final Validator echo = Validator({ 'message*': (String message) => message.length >= 5 diff --git a/packages/validate/example/main.dart b/packages/validate/example/main.dart index 145945aa..b926921d 100644 --- a/packages/validate/example/main.dart +++ b/packages/validate/example/main.dart @@ -1,4 +1,4 @@ -import 'package:angel3_validate/angel3_validate.dart'; +import 'package:protevus_validate/protevus_validate.dart'; void main() { var bio = Validator({ diff --git a/packages/validate/lib/angel3_validate.dart b/packages/validate/lib/protevus_validate.dart similarity index 93% rename from packages/validate/lib/angel3_validate.dart rename to packages/validate/lib/protevus_validate.dart index 33bb43b4..b3d3a7be 100644 --- a/packages/validate/lib/angel3_validate.dart +++ b/packages/validate/lib/protevus_validate.dart @@ -1,5 +1,5 @@ /// Cross-platform validation library based on `matcher`. -library angel3_validate; +library protevus_validate; export 'package:matcher/matcher.dart'; export 'src/context_aware.dart'; diff --git a/packages/validate/lib/server.dart b/packages/validate/lib/server.dart index 5c86b8ae..22892a09 100644 --- a/packages/validate/lib/server.dart +++ b/packages/validate/lib/server.dart @@ -1,13 +1,13 @@ /// Support for using `angel_validate` with the Protevus Framework. -library angel3_validate.server; +library protevus_validate.server; import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'src/async.dart'; -import 'angel3_validate.dart'; +import 'protevus_validate.dart'; export 'src/async.dart'; -export 'angel3_validate.dart'; +export 'protevus_validate.dart'; /// Auto-parses numbers in `req.bodyAsMap`. RequestHandler autoParseBody(List fields) { diff --git a/packages/validate/lib/src/async.dart b/packages/validate/lib/src/async.dart index 410b0e5f..a0b86e4d 100644 --- a/packages/validate/lib/src/async.dart +++ b/packages/validate/lib/src/async.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:angel3_framework/angel3_framework.dart'; +import 'package:protevus_framework/protevus_framework.dart'; import 'package:matcher/matcher.dart'; import 'context_aware.dart'; diff --git a/packages/validate/lib/src/validator.dart b/packages/validate/lib/src/validator.dart index e09ec043..a7c311aa 100644 --- a/packages/validate/lib/src/validator.dart +++ b/packages/validate/lib/src/validator.dart @@ -1,4 +1,4 @@ -import 'package:angel3_http_exception/angel3_http_exception.dart'; +import 'package:protevus_http_exception/protevus_http_exception.dart'; import 'package:matcher/matcher.dart'; import 'context_aware.dart'; import 'context_validator.dart'; diff --git a/packages/validate/pubspec.yaml b/packages/validate/pubspec.yaml index 56560ccc..95a13175 100644 --- a/packages/validate/pubspec.yaml +++ b/packages/validate/pubspec.yaml @@ -1,4 +1,4 @@ -name: angel3_validate +name: protevus_validate description: Cross-platform HTTP request body validator library based on `matcher`. version: 8.2.0 homepage: https://protevus-framework.web.app/ @@ -6,26 +6,26 @@ repository: https://github.com/dart-backend/protevus/tree/master/packages/valida environment: sdk: '>=3.3.0 <4.0.0' dependencies: - angel3_framework: ^8.0.0 - angel3_http_exception: ^8.0.0 + protevus_framework: ^8.0.0 + protevus_http_exception: ^8.0.0 matcher: ^0.12.0 dev_dependencies: - angel3_mock_request: ^8.0.0 + protevus_mock_request: ^8.0.0 build_runner: ^2.4.0 build_web_compilers: ^4.0.0 logging: ^1.2.0 lints: ^4.0.0 test: ^1.24.0 # dependency_overrides: -# angel3_container: +# protevus_container: # path: ../container/angel_container -# angel3_framework: +# protevus_framework: # path: ../framework -# angel3_http_exception: +# protevus_http_exception: # path: ../http_exception -# angel3_model: +# protevus_model: # path: ../model -# angel3_route: +# protevus_route: # path: ../route -# angel3_mock_request: +# protevus_mock_request: # path: ../mock_request \ No newline at end of file diff --git a/packages/validate/test/basic_data_test.dart b/packages/validate/test/basic_data_test.dart index 68ea10e1..501e35e6 100644 --- a/packages/validate/test/basic_data_test.dart +++ b/packages/validate/test/basic_data_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_validate/angel3_validate.dart'; +import 'package:protevus_validate/protevus_validate.dart'; import 'package:test/test.dart'; final Validator emailSchema = diff --git a/packages/validate/test/complex_data_test.dart b/packages/validate/test/complex_data_test.dart index 23f0af56..fc670838 100644 --- a/packages/validate/test/complex_data_test.dart +++ b/packages/validate/test/complex_data_test.dart @@ -1,4 +1,4 @@ -import 'package:angel3_validate/angel3_validate.dart'; +import 'package:protevus_validate/protevus_validate.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/validate/test/server_test.dart b/packages/validate/test/server_test.dart index bd72cf1d..12df5edf 100644 --- a/packages/validate/test/server_test.dart +++ b/packages/validate/test/server_test.dart @@ -1,12 +1,12 @@ import 'dart:async'; import 'dart:convert'; -import 'package:angel3_framework/angel3_framework.dart'; -import 'package:angel3_framework/http.dart'; +import 'package:protevus_framework/protevus_framework.dart'; +import 'package:protevus_framework/http.dart'; //import 'package:angel_test/angel_test.dart'; -import 'package:angel3_validate/server.dart'; +import 'package:protevus_validate/server.dart'; import 'package:logging/logging.dart'; -import 'package:angel3_mock_request/angel3_mock_request.dart'; +import 'package:protevus_mock_request/protevus_mock_request.dart'; import 'package:test/test.dart'; final Validator echoSchema = Validator({'message*': isString}); diff --git a/packages/validate/web/index.html b/packages/validate/web/index.html index 803aef06..3f522274 100644 --- a/packages/validate/web/index.html +++ b/packages/validate/web/index.html @@ -2,7 +2,7 @@ - angel3_validate + protevus_validate