From 52665cdee5edb69db31ea8fa12a65a6a0721b977 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Sun, 17 Jul 2022 22:29:36 +0200 Subject: [PATCH 01/12] feat(types): add mason generated package --- packages/wyatt_type_utils/.gitignore | 133 ++++ .../wyatt_type_utils/.vscode/extensions.json | 24 + packages/wyatt_type_utils/.vscode/launch.json | 16 + .../wyatt_type_utils/.vscode/settings.json | 71 ++ packages/wyatt_type_utils/AUTHORS | 8 + packages/wyatt_type_utils/CHANGELOG.md | 3 + packages/wyatt_type_utils/LICENSE | 674 ++++++++++++++++++ packages/wyatt_type_utils/README.md | 42 ++ .../wyatt_type_utils/analysis_options.yaml | 19 + .../wyatt_type_utils/example/lib/main.dart | 21 + .../wyatt_type_utils/example/pubspec.yaml | 46 ++ .../example/test/widget_test.dart | 15 + .../wyatt_type_utils/example/web/favicon.png | Bin 0 -> 917 bytes .../example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes .../example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../example/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../example/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes .../wyatt_type_utils/example/web/index.html | 58 ++ .../example/web/manifest.json | 35 + packages/wyatt_type_utils/pubspec.yaml | 15 + 20 files changed, 1180 insertions(+) create mode 100644 packages/wyatt_type_utils/.gitignore create mode 100644 packages/wyatt_type_utils/.vscode/extensions.json create mode 100644 packages/wyatt_type_utils/.vscode/launch.json create mode 100644 packages/wyatt_type_utils/.vscode/settings.json create mode 100644 packages/wyatt_type_utils/AUTHORS create mode 100644 packages/wyatt_type_utils/CHANGELOG.md create mode 100644 packages/wyatt_type_utils/LICENSE create mode 100644 packages/wyatt_type_utils/README.md create mode 100644 packages/wyatt_type_utils/analysis_options.yaml create mode 100644 packages/wyatt_type_utils/example/lib/main.dart create mode 100644 packages/wyatt_type_utils/example/pubspec.yaml create mode 100644 packages/wyatt_type_utils/example/test/widget_test.dart create mode 100644 packages/wyatt_type_utils/example/web/favicon.png create mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-192.png create mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-512.png create mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-maskable-192.png create mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-maskable-512.png create mode 100644 packages/wyatt_type_utils/example/web/index.html create mode 100644 packages/wyatt_type_utils/example/web/manifest.json create mode 100644 packages/wyatt_type_utils/pubspec.yaml diff --git a/packages/wyatt_type_utils/.gitignore b/packages/wyatt_type_utils/.gitignore new file mode 100644 index 00000000..e38f9b0c --- /dev/null +++ b/packages/wyatt_type_utils/.gitignore @@ -0,0 +1,133 @@ +# Miscellaneous +*.class +*.lock +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/* + +# Visual Studio Code related +.classpath +.project +.settings/ +.vscode/* +!.vscode/settings.json +!.vscode/extensions.json + +# Flutter repo-specific +/bin/cache/ +/bin/mingit/ +/dev/benchmarks/mega_gallery/ +/dev/bots/.recipe_deps +/dev/bots/android_tools/ +/dev/docs/doc/ +/dev/docs/flutter.docs.zip +/dev/docs/lib/ +/dev/docs/pubspec.yaml +/dev/integration_tests/**/xcuserdata +/dev/integration_tests/**/Pods +/packages/flutter/coverage/ +version + +# packages file containing multi-root paths +.packages.generated + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +build/ +flutter_*.png +linked_*.ds +unlinked.ds +unlinked_spec.ds +.fvm/ + +# Android related +**/android/**/gradle-wrapper.jar +**/android/.gradle +**/android/captures/ +**/android/gradlew +**/android/gradlew.bat +**/android/local.properties +**/android/**/GeneratedPluginRegistrant.java +**/android/key.properties +**/android/.idea/ +*.jks + +# iOS/XCode related +**/ios/**/*.mode1v3 +**/ios/**/*.mode2v3 +**/ios/**/*.moved-aside +**/ios/**/*.pbxuser +**/ios/**/*.perspectivev3 +**/ios/**/*sync/ +**/ios/**/.sconsign.dblite +**/ios/**/.tags* +**/ios/**/.vagrant/ +**/ios/**/DerivedData/ +**/ios/**/Icon? +**/ios/**/Pods/ +**/ios/**/.symlinks/ +**/ios/**/profile +**/ios/**/xcuserdata +**/ios/.generated/ +**/ios/Flutter/App.framework +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Flutter.podspec +**/ios/Flutter/Generated.xcconfig +**/ios/Flutter/app.flx +**/ios/Flutter/app.zip +**/ios/Flutter/.last_build_id +**/ios/Flutter/flutter_assets/ +**/ios/Flutter/flutter_export_environment.sh +**/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* + +# Coverage +coverage/ + +# Submodules +!pubspec.lock +packages/**/pubspec.lock + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Exceptions to the above rules. +!**/ios/**/default.mode1v3 +!**/ios/**/default.mode2v3 +!**/ios/**/default.pbxuser +!**/ios/**/default.perspectivev3 +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +!/dev/ci/**/Gemfile.lock +!.vscode/extensions.json +!.vscode/launch.json +!.idea/codeStyles/ +!.idea/dictionaries/ +!.idea/runConfigurations/ + +# Omit committing pubspec.lock for library packages; see +# https://dart.dev/guides/libraries/private-files#pubspeclock. +pubspec.lock diff --git a/packages/wyatt_type_utils/.vscode/extensions.json b/packages/wyatt_type_utils/.vscode/extensions.json new file mode 100644 index 00000000..30cd2233 --- /dev/null +++ b/packages/wyatt_type_utils/.vscode/extensions.json @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2022 WYATT GROUP + * Please see the AUTHORS file for details. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +{ + "recommendations": [ + "psioniq.psi-header", + "blaugold.melos-code" + ] +} \ No newline at end of file diff --git a/packages/wyatt_type_utils/.vscode/launch.json b/packages/wyatt_type_utils/.vscode/launch.json new file mode 100644 index 00000000..a5f4f148 --- /dev/null +++ b/packages/wyatt_type_utils/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Example", + "request": "launch", + "type": "dart", + "cwd": "example/", + "program": "lib/main.dart", + "flutterMode": "debug" + }, + ] +} \ No newline at end of file diff --git a/packages/wyatt_type_utils/.vscode/settings.json b/packages/wyatt_type_utils/.vscode/settings.json new file mode 100644 index 00000000..708f5ba6 --- /dev/null +++ b/packages/wyatt_type_utils/.vscode/settings.json @@ -0,0 +1,71 @@ +{ + "psi-header.changes-tracking": { + "isActive": true + }, + "psi-header.config": { + "blankLinesAfter": 1, + "forceToTop": true + }, + "psi-header.lang-config": [ + { + "beforeHeader": [ + "# -*- coding:utf-8 -*-", + "#!/usr/bin/env python3" + ], + "begin": "###", + "end": "###", + "language": "python", + "prefix": "# " + }, + { + "beforeHeader": [ + "#!/usr/bin/env sh", + "" + ], + "language": "shellscript", + "begin": "", + "end": "", + "prefix": "# " + }, + { + "begin": "", + "end": "", + "language": "dart", + "prefix": "// " + }, + { + "begin": "", + "end": "", + "language": "yaml", + "prefix": "# " + }, + { + "begin": "", + "language": "markdown", + }, + ], + "psi-header.templates": [ + { + "language": "*", + "template": [ + "Copyright (C) <> WYATT GROUP", + "Please see the AUTHORS file for details.", + "", + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "any later version.", + "", + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY WARRANTY; without even the implied warranty of", + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", + "GNU General Public License for more details.", + "", + "You should have received a copy of the GNU General Public License", + "along with this program. If not, see ." + ], + } + ], + "dart.runPubGetOnPubspecChanges": false, +} \ No newline at end of file diff --git a/packages/wyatt_type_utils/AUTHORS b/packages/wyatt_type_utils/AUTHORS new file mode 100644 index 00000000..f9506138 --- /dev/null +++ b/packages/wyatt_type_utils/AUTHORS @@ -0,0 +1,8 @@ +# Below is a list of people and organizations that have contributed +# to this project. Names should be added to the list like so: +# +# Name/Organization + +Wyatt Group S.A.S +Hugo Pointcheval +Malo Léon \ No newline at end of file diff --git a/packages/wyatt_type_utils/CHANGELOG.md b/packages/wyatt_type_utils/CHANGELOG.md new file mode 100644 index 00000000..7ad72ac3 --- /dev/null +++ b/packages/wyatt_type_utils/CHANGELOG.md @@ -0,0 +1,3 @@ +# 0.0.1 + +- TODO: Describe initial release. diff --git a/packages/wyatt_type_utils/LICENSE b/packages/wyatt_type_utils/LICENSE new file mode 100644 index 00000000..e72bfdda --- /dev/null +++ b/packages/wyatt_type_utils/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/packages/wyatt_type_utils/README.md b/packages/wyatt_type_utils/README.md new file mode 100644 index 00000000..19e55ae0 --- /dev/null +++ b/packages/wyatt_type_utils/README.md @@ -0,0 +1,42 @@ + + + + +# Dart - Wyatt Type Utils + +

+ + Style: Wyatt Analysis + + SDK: Dart & Flutter +

+ +Type Utils for Dart & Flutter. + +## Features + + + +## Getting started + + + +## Usage + + \ No newline at end of file diff --git a/packages/wyatt_type_utils/analysis_options.yaml b/packages/wyatt_type_utils/analysis_options.yaml new file mode 100644 index 00000000..aa9f26bc --- /dev/null +++ b/packages/wyatt_type_utils/analysis_options.yaml @@ -0,0 +1,19 @@ +# Copyright (C) 2022 WYATT GROUP +# Please see the AUTHORS file for details. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + + +include: package:wyatt_analysis/analysis_options.yaml diff --git a/packages/wyatt_type_utils/example/lib/main.dart b/packages/wyatt_type_utils/example/lib/main.dart new file mode 100644 index 00000000..5857e8c8 --- /dev/null +++ b/packages/wyatt_type_utils/example/lib/main.dart @@ -0,0 +1,21 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'package:wyatt_type_utils/wyatt_type_utils.dart'; + +void main() { + print(wyatt()); +} diff --git a/packages/wyatt_type_utils/example/pubspec.yaml b/packages/wyatt_type_utils/example/pubspec.yaml new file mode 100644 index 00000000..09085171 --- /dev/null +++ b/packages/wyatt_type_utils/example/pubspec.yaml @@ -0,0 +1,46 @@ +name: type_utils_example +description: A new Flutter project. + +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +version: 1.0.0+1 + +environment: + sdk: ">=2.17.0 <3.0.0" + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + + + wyatt_type_utils: + path: "../" + +dev_dependencies: + + + wyatt_analysis: + git: + url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages + ref: wyatt_analysis-v2.1.0 + path: packages/wyatt_analysis + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + diff --git a/packages/wyatt_type_utils/example/test/widget_test.dart b/packages/wyatt_type_utils/example/test/widget_test.dart new file mode 100644 index 00000000..52de7a27 --- /dev/null +++ b/packages/wyatt_type_utils/example/test/widget_test.dart @@ -0,0 +1,15 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . \ No newline at end of file diff --git a/packages/wyatt_type_utils/example/web/favicon.png b/packages/wyatt_type_utils/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-192.png b/packages/wyatt_type_utils/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-512.png b/packages/wyatt_type_utils/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-maskable-192.png b/packages/wyatt_type_utils/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-maskable-512.png b/packages/wyatt_type_utils/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/packages/wyatt_type_utils/example/web/index.html b/packages/wyatt_type_utils/example/web/index.html new file mode 100644 index 00000000..41b3bc33 --- /dev/null +++ b/packages/wyatt_type_utils/example/web/index.html @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + example + + + + + + + + + + diff --git a/packages/wyatt_type_utils/example/web/manifest.json b/packages/wyatt_type_utils/example/web/manifest.json new file mode 100644 index 00000000..096edf8f --- /dev/null +++ b/packages/wyatt_type_utils/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "example", + "short_name": "example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/packages/wyatt_type_utils/pubspec.yaml b/packages/wyatt_type_utils/pubspec.yaml new file mode 100644 index 00000000..0fed0bb2 --- /dev/null +++ b/packages/wyatt_type_utils/pubspec.yaml @@ -0,0 +1,15 @@ +name: wyatt_type_utils +description: Either, Optional and other useful types. +repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_type_utils +version: 0.0.1 + +environment: + sdk: '>=2.17.0 <3.0.0' + +dev_dependencies: + test: ^1.21.4 + wyatt_analysis: + git: + url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages + ref: wyatt_analysis-v2.2.1 + path: packages/wyatt_analysis \ No newline at end of file From fc7a4560f032ddcb9ae56eda8d2b784a5017d401 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Mon, 18 Jul 2022 16:54:38 +0200 Subject: [PATCH 02/12] feat(types): add strongly typed Option and Result. --- packages/wyatt_type_utils/README.md | 49 +- .../wyatt_type_utils/analysis_options.yaml | 5 +- .../wyatt_type_utils/example/lib/error.dart | 33 ++ .../wyatt_type_utils/example/lib/main.dart | 46 +- .../wyatt_type_utils/example/lib/todo.dart | 85 ++++ .../wyatt_type_utils/example/pubspec.yaml | 9 +- .../example/test/widget_test.dart | 2 +- .../wyatt_type_utils/lib/src/either_base.dart | 145 ++++++ .../lib/src/future_result.dart | 108 +++++ packages/wyatt_type_utils/lib/src/option.dart | 301 +++++++++++++ packages/wyatt_type_utils/lib/src/result.dart | 327 ++++++++++++++ packages/wyatt_type_utils/lib/src/src.dart | 17 + .../lib/wyatt_type_utils.dart | 20 + packages/wyatt_type_utils/pubspec.yaml | 2 +- .../wyatt_type_utils/test/option_test.dart | 280 ++++++++++++ .../wyatt_type_utils/test/result_test.dart | 425 ++++++++++++++++++ 16 files changed, 1836 insertions(+), 18 deletions(-) create mode 100644 packages/wyatt_type_utils/example/lib/error.dart create mode 100644 packages/wyatt_type_utils/example/lib/todo.dart create mode 100644 packages/wyatt_type_utils/lib/src/either_base.dart create mode 100644 packages/wyatt_type_utils/lib/src/future_result.dart create mode 100644 packages/wyatt_type_utils/lib/src/option.dart create mode 100644 packages/wyatt_type_utils/lib/src/result.dart create mode 100644 packages/wyatt_type_utils/lib/src/src.dart create mode 100644 packages/wyatt_type_utils/lib/wyatt_type_utils.dart create mode 100644 packages/wyatt_type_utils/test/option_test.dart create mode 100644 packages/wyatt_type_utils/test/result_test.dart diff --git a/packages/wyatt_type_utils/README.md b/packages/wyatt_type_utils/README.md index 19e55ae0..84de5044 100644 --- a/packages/wyatt_type_utils/README.md +++ b/packages/wyatt_type_utils/README.md @@ -29,14 +29,51 @@ Type Utils for Dart & Flutter. -## Features +## Option\ - +**Option** is a container object which may or may not contain a non-null value. If a **Value** is present, `isPresent()` will return true and `get()` will return the value. Additional methods that depend on the presence or absence of a contained value are provided, such as `orElse()` (return a default value if value not present) and `ifPresent()` (execute a block of code if the value is present). -## Getting started +```dart +final Option rand = Option.ofNullable( + Random().nextBool() ? null : 10, +); - +print( + "`rand` is${rand.isNull ? "" : " not"} null, " + "so it's value is ${rand.orElse(15)}", +); -## Usage +// Ok, `orElse` is equivalent to ?? but the Option is +// useful for match pattern and other utils accesses. +rand.match((value) { + print('Value is: $value'); + }, () { + print('Rand is null'); + }, +); - \ No newline at end of file +print('`rand` contains 10 ? => ${rand.contains(10)}'); +``` + +## Result\ + +**Result** type is coming from functional languages where exceptions are (rightfully) considered a side-effect, and therefore not appropriate to pass domain errors. Mind the difference between different kinds of errors: Some of them belong to domain, others don't. + +*E.g. null reference exception or index out of bounds are not related to domain - they rather indicate a defect.* + +Either is defined as a generic type with two branches +- success with **T** +- failure with **E** + +It can appear in two forms, where it contains an object of **Ok**, or where it contains an object of **Err**. It cannot appear in both states at once, or in none of them. Therefore, if one possesses an **Result** instance, it either contains a successfully produced result, or contains an error object. + +```dart +Future> requestTodo() async => Result.tryCatchAsync( + () => get('https://jsonplaceholder.typicode.com/todos/1'), + (error) => ServerError('Error while getting todo'), +); + +final Result todo1 = await requestTodo(); +// In Flutter: +todo1.either(buildWidgetWithTodo, buildSizedBox); +``` diff --git a/packages/wyatt_type_utils/analysis_options.yaml b/packages/wyatt_type_utils/analysis_options.yaml index aa9f26bc..2f4f39c0 100644 --- a/packages/wyatt_type_utils/analysis_options.yaml +++ b/packages/wyatt_type_utils/analysis_options.yaml @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - - include: package:wyatt_analysis/analysis_options.yaml + +analyzer: + exclude: "!example/**" diff --git a/packages/wyatt_type_utils/example/lib/error.dart b/packages/wyatt_type_utils/example/lib/error.dart new file mode 100644 index 00000000..67008d6d --- /dev/null +++ b/packages/wyatt_type_utils/example/lib/error.dart @@ -0,0 +1,33 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +class AppError { + final String message; + + const AppError(this.message); + + @override + // ignore: no_runtimetype_tostring + String toString() => '$runtimeType: $message'; +} + +class ServerError extends AppError { + ServerError(super.message); +} + +class ClientError extends AppError { + ClientError(super.message); +} diff --git a/packages/wyatt_type_utils/example/lib/main.dart b/packages/wyatt_type_utils/example/lib/main.dart index 5857e8c8..e905a556 100644 --- a/packages/wyatt_type_utils/example/lib/main.dart +++ b/packages/wyatt_type_utils/example/lib/main.dart @@ -14,8 +14,50 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +import 'dart:math'; + +import 'package:http/http.dart' as http; +import 'package:type_utils_example/error.dart'; +import 'package:type_utils_example/todo.dart'; import 'package:wyatt_type_utils/wyatt_type_utils.dart'; -void main() { - print(wyatt()); +Future get(String url) async { + final res = await http.get(Uri.parse(url)); + final todo = TodoModel.fromJson(res.body); + return todo; +} + +Future> requestTodo() async => Result.tryCatchAsync( + () => get('https://jsonplaceholder.typicode.com/todos/1'), + (error) => ServerError('Error while getting todo'), + ); + +Future> requestBadTodo() async => + Result.tryCatchAsync( + () => get('https://jsonplaceholder.typicode.com/todos/123897'), + (error) => ServerError('Error while getting todo'), + ); + +Future main() async { + final Result todo1 = await requestTodo(); + todo1.either(print, print); + + final Result todo2 = await requestBadTodo(); + todo2.either(print, print); + + final Option rand = Option.ofNullable(Random().nextBool() ? null : 10); + + print( + "`rand` is${rand.isNull ? "" : " not"} null, " + "so it's value is ${rand.orElse(15)}", + ); + + // Ok, `orElse` is equivalent to ?? but the Option is useful for match pattern + rand.match((value) { + print('Value is: $value'); + }, () { + print('Rand is null'); + }); + + print('`rand` contains 10 ? => ${rand.contains(10)}'); } diff --git a/packages/wyatt_type_utils/example/lib/todo.dart b/packages/wyatt_type_utils/example/lib/todo.dart new file mode 100644 index 00000000..e5f21752 --- /dev/null +++ b/packages/wyatt_type_utils/example/lib/todo.dart @@ -0,0 +1,85 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// ignore_for_file: public_member_api_docs, sort_constructors_first, +// ignore_for_file: avoid_equals_and_hash_code_on_mutable_classes + +import 'dart:convert'; + +class TodoModel { + final int id; + final int userId; + final String title; + final bool completed; + TodoModel({ + required this.id, + required this.userId, + required this.title, + required this.completed, + }); + + TodoModel copyWith({ + int? id, + int? userId, + String? title, + bool? completed, + }) => + TodoModel( + id: id ?? this.id, + userId: userId ?? this.userId, + title: title ?? this.title, + completed: completed ?? this.completed, + ); + + Map toMap() => { + 'id': id, + 'userId': userId, + 'title': title, + 'completed': completed, + }; + + factory TodoModel.fromMap(Map map) => TodoModel( + id: map['id'] as int, + userId: map['userId'] as int, + title: map['title'] as String, + completed: map['completed'] as bool, + ); + + String toJson() => json.encode(toMap()); + + factory TodoModel.fromJson(String source) => + TodoModel.fromMap(json.decode(source) as Map); + + @override + String toString() => 'TodoModel(id: $id, userId: $userId, title: ' + '$title, completed: $completed)'; + + @override + bool operator ==(covariant TodoModel other) { + if (identical(this, other)) { + return true; + } + + return other.id == id && + other.userId == userId && + other.title == title && + other.completed == completed; + } + + @override + int get hashCode => + id.hashCode ^ userId.hashCode ^ title.hashCode ^ completed.hashCode; +} diff --git a/packages/wyatt_type_utils/example/pubspec.yaml b/packages/wyatt_type_utils/example/pubspec.yaml index 09085171..0562fe59 100644 --- a/packages/wyatt_type_utils/example/pubspec.yaml +++ b/packages/wyatt_type_utils/example/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -27,20 +27,17 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - - + http: ^0.13.4 + wyatt_type_utils: path: "../" dev_dependencies: - - wyatt_analysis: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages ref: wyatt_analysis-v2.1.0 path: packages/wyatt_analysis - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/wyatt_type_utils/example/test/widget_test.dart b/packages/wyatt_type_utils/example/test/widget_test.dart index 52de7a27..1bb8b149 100644 --- a/packages/wyatt_type_utils/example/test/widget_test.dart +++ b/packages/wyatt_type_utils/example/test/widget_test.dart @@ -12,4 +12,4 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program. If not, see . \ No newline at end of file +// along with this program. If not, see . diff --git a/packages/wyatt_type_utils/lib/src/either_base.dart b/packages/wyatt_type_utils/lib/src/either_base.dart new file mode 100644 index 00000000..651132ef --- /dev/null +++ b/packages/wyatt_type_utils/lib/src/either_base.dart @@ -0,0 +1,145 @@ +// // Copyright (C) 2022 WYATT GROUP +// // Please see the AUTHORS file for details. +// // +// // This program is free software: you can redistribute it and/or modify +// // it under the terms of the GNU General Public License as published by +// // the Free Software Foundation, either version 3 of the License, or +// // any later version. +// // +// // This program is distributed in the hope that it will be useful, +// // but WITHOUT ANY WARRANTY; without even the implied warranty of +// // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// // GNU General Public License for more details. +// // +// // You should have received a copy of the GNU General Public License +// // along with this program. If not, see . + +// // ignore_for_file: avoid_positional_boolean_parameters + +part 'future_result.dart'; +part 'result.dart'; +part 'option.dart'; + +mixin _Left on _EitherBase {} + +mixin _Right on _EitherBase {} + +class _EitherBaseException implements Exception { + final String message; + const _EitherBaseException(this.message); + + @override + String toString() => '_EitherException: $message'; +} + +abstract class _EitherBase { + const _EitherBase(); + + bool get _isLeft => this is _Left; + + bool get _isRight => this is _Right; + + LeftType? get _left => _fold( + (value) => value, + (right) => null, + ); + + RightType? get _right => _fold( + (left) => null, + (value) => value, + ); + + U _unwrap() { + if (U == LeftType) { + return _fold( + (value) => value, + (right) => throw const ResultException( + 'Illegal use. You should check left value before calling', + ), + ) as U; + } + if (U == RightType) { + return _fold( + (left) => throw const ResultException( + 'Illegal use. You should check right value before calling', + ), + (value) => value, + ) as U; + } + throw ResultException( + 'Illegal use. You should use $LeftType or $RightType type', + ); + } + + Future _unwrapAsync() { + if (U == LeftType) { + return _foldAsync( + Future.value, + (right) => throw const ResultException( + 'Illegal use. You should check left value before calling', + ), + ) as Future; + } + if (U == RightType) { + return _foldAsync( + (left) => throw const ResultException( + 'Illegal use. You should check right value before calling', + ), + Future.value, + ) as Future; + } + throw ResultException( + 'Illegal use. You should use $LeftType or $RightType type', + ); + } + + U _fold( + U Function(LeftType left) fnL, + U Function(RightType right) fnR, + ); + + Future _foldAsync( + Future Function(LeftType left) fnL, + Future Function(RightType right) fnR, + ); + + _EitherBase _and( + _EitherBase res, + ); + + _EitherBase _or( + _EitherBase res, + ); + + bool _contains(U x); + + LeftType _expect(String msg); + + RightType _expectErr(String msg); + + _EitherBase _map( + U Function(LeftType left) mapper, + ); + + Future<_EitherBase> _mapAsync( + Future Function(LeftType left) mapper, + ); + + _EitherBase _mapErr( + F Function(RightType right) mapper, + ); + + Future<_EitherBase> _mapErrAsync( + Future Function(RightType right) mapper, + ); + + _EitherBase _either( + L Function(LeftType left) fnL, + R Function(RightType right) fnR, + ); + + Future<_EitherBase> _eitherAsync( + Future Function(LeftType left) fnL, + Future Function(RightType right) fnR, + ); +} diff --git a/packages/wyatt_type_utils/lib/src/future_result.dart b/packages/wyatt_type_utils/lib/src/future_result.dart new file mode 100644 index 00000000..95f8942f --- /dev/null +++ b/packages/wyatt_type_utils/lib/src/future_result.dart @@ -0,0 +1,108 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +part of 'either_base.dart'; + +extension FutureResult on Future> { + /// Represents the left side of [Result] class. + Future get isOk => then((result) => result.isOk); + + /// Represents the right side of [Result] class. + Future get isErr => then((result) => result.isErr); + + /// Get [U] value, may throw an exception. + Future unwrap() => then((result) => result.unwrap()); + + /// Get **async** [U] value, may throw an exception. + /// + /// With nullable, `Future(Future(U)) == Future(U)` + Future unwrapAsync() => then((result) => result.unwrapAsync()); + + /// Fold [Ok] and [Err] into the value of one type + Future fold( + U Function(T value) valueTransformer, + U Function(E error) errorTransformer, + ) => + then((result) => result.fold(valueTransformer, errorTransformer)); + + /// Fold [Ok] and [Err] **asynchronously** into the value of one type + Future foldAsync( + Future Function(T value) valueTransformer, + Future Function(E error) errorTransformer, + ) => + then((result) => result.foldAsync(valueTransformer, errorTransformer)); + + /// Swap [Ok] and [Err] + Future> swap() => then((result) => result.swap()); + + /// Returns [res] if the [Result] is [Ok], otherwise returns + /// the [Err] value of this. + Future> and(Result res) => + then((result) => result.and(res)); + + /// Returns [res] if the [Result] is [Err], otherwise returns + /// the [Ok] value of this. + Future> or(Result res) => + then((result) => result.or(res)); + + /// Returns true if the result is an [Ok] or [Err] value containing + /// the given value/error. + Future contains(U x) => then((result) => result.contains(x)); + + /// Returns the contained [Ok] value. Throw [ResultException] on [Err] with + /// its content. + Future expect(String msg) => then((result) => result.expect(msg)); + + /// Returns the contained [Err] value. Throw [ResultException] on [Ok] with + /// its content. + Future expectErr(String msg) => then((result) => result.expectErr(msg)); + + /// Maps a [Result] to [Result] by applying a function to a + /// contained [Ok] value, leaving an [Err] value untouched. + Future> map(U Function(T value) mapper) => + then((result) => result.map(mapper)); + + /// Maps a [Result] to [Result] by applying an **async** function + /// to a contained [Ok] value, leaving an [Err] value untouched. + Future> mapAsync(Future Function(T value) mapper) => + then((result) => result.mapAsync(mapper)); + + /// Maps a [Result] to [Result] by applying a function to a + /// contained [Err] value, leaving an [Ok] value untouched. + Future> mapErr(F Function(E error) mapper) => + then((result) => result.mapErr(mapper)); + + /// Maps a [Result] to [Result] by applying an **async** function + /// to a contained [Err] value, leaving an [Ok] value untouched. + Future> mapErrAsync(Future Function(E error) mapper) => + then((result) => result.mapErrAsync(mapper)); + + /// Transforms a [Result] to [Result] by applying functions to + /// contained [Ok] and [Err] values. + Future> either( + U Function(T value) valueTransformer, + F Function(E error) errorTransformer, + ) => + then((result) => result.either(valueTransformer, errorTransformer)); + + /// Transforms a [Result] to [Result] by applying **async** + /// functions to contained [Ok] and [Err] values. + Future> eitherAsync( + Future Function(T value) valueTransformer, + Future Function(E error) errorTransformer, + ) => + then((result) => result.eitherAsync(valueTransformer, errorTransformer)); +} diff --git a/packages/wyatt_type_utils/lib/src/option.dart b/packages/wyatt_type_utils/lib/src/option.dart new file mode 100644 index 00000000..b86a510b --- /dev/null +++ b/packages/wyatt_type_utils/lib/src/option.dart @@ -0,0 +1,301 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +part of 'either_base.dart'; + +/// {@template option_exception} +/// [OptionException] is sometimes threw by [Option] objects. +/// +/// ```dart +/// throw OptionException('Emergency failure!'); +/// ``` +/// {@endtemplate} +class OptionException extends _EitherBaseException { + /// {@macro result_exception} + const OptionException(super.message); + + @override + String toString() => 'OptionException: $message'; +} + +/// {@template option} +/// [Option] is a container object which may or may not contain a non-null +/// value. If a [Value] is present, isPresent() will return true and get() +/// will return the value. +/// +/// Additional methods that depend on the presence or absence of +/// a contained value are provided, such as orElse() (return a default value +/// if value not present) and ifPresent() (execute a block of code if the +/// value is present). +/// {@endtemplate} +abstract class Option extends _EitherBase { + /// {@macro option} + const Option._(); + + /// Represents the left side of [Option] class. + bool get isPresent => _isLeft; + + /// Represents the right side of [Option] class. + bool get isNull => _isRight; + + /// Get nullable [Value]. + T? get() => _left; + + /// Get [U] value, may throw an exception. + U unwrap() => _unwrap(); + + /// Get **async** [U] value, may throw an exception. + Future unwrapAsync() => _unwrapAsync(); + + /// Match [Value] and [None]. + void match( + void Function(T value) value, + void Function() none, + ) => + _fold( + (left) => value(left), + (right) => none(), + ); + + /// Match **async** [Value] and [None]. + Future matchAsync( + Future Function(T value) value, + Future Function() none, + ) => + _foldAsync( + (left) => value(left), + (right) => none(), + ); + + /// If [Value] is present, invoke the specified consumer + /// with the value, otherwise do nothing. + void ifPresent( + void Function(T value) consumer, + ) => + _fold( + (left) => consumer(left), + (right) => {}, + ); + + /// Return the [Value] if present, otherwise return [other]. + T orElse( + T other, + ) => + _fold( + (left) => left, + (right) => other, + ); + + /// Return the [Value] if present, otherwise call and return result + /// of [supplier]. + T orElseLazy( + T Function() supplier, + ) => + _fold( + (left) => left, + (right) => supplier(), + ); + + /// Returns [res] if the [Option] is [Value], otherwise returns + /// the [None] value of this. + Option and(Option res) => _and(res) as Option; + + /// Returns [res] if the [Option] is [None], otherwise returns + /// the [Value] of this. + Option or(Option res) => _or(res) as Option; + + /// Returns true if the result is a [Value]. + bool contains(U x) => _contains(x); + + /// Returns the contained [Value]. Throw [OptionException] on [None]. + T expect(String msg) => _expect(msg); + + /// Maps a [Option] to [Option] by applying a function to a + /// contained [Value]. + Option map(U Function(T value) mapper) => _map(mapper) as Option; + + /// Maps a [Option] to [Option] by applying an **async** function + /// to a contained [Value]. + Future> mapAsync(Future Function(T value) mapper) async => + await _mapAsync(mapper) as Option; + + /// Constructs an [Option] with the specified present non-null [Value]. + static Value of(T value) { + if (value == null) { + throw const OptionException("Value can' be null. Use `ofNullable()`"); + } + return ofNullable(value) as Value; + } + + /// Constructs an [Option] describing the specified [Value], + /// if non-null, otherwise returns a [None]. + static Option ofNullable(T? value) { + if (value != null) { + return Value(value); + } else { + return None(); + } + } + + /// Constructs an [Option] with the specified present non-null [Value]. + static Value ofLazy(T Function() value) { + final v = value(); + if (v == null) { + throw const OptionException("Value can' be null. Use `ofNullableLazy()`"); + } + return ofNullable(v) as Value; + } + + /// Constructs an [Option] describing the specified [Value], + /// if non-null, otherwise returns a [None]. + static Option ofNullableLazy(T? Function() value) { + final v = value(); + if (v != null) { + return Value(v); + } else { + return None(); + } + } +} + +class Value extends Option with _Left { + final T value; + + /// {@macro ok} + const Value(this.value) : super._(); + + @override + _EitherBase _and(_EitherBase res) => res as Option; + + @override + bool _contains(U x) => value == x; + + @override + _EitherBase _either( + L Function(T left) fnL, + R Function(void right) fnR, + ) => + throw UnimplementedError(); + + @override + Future<_EitherBase> _eitherAsync( + Future Function(T left) fnL, + Future Function(void right) fnR, + ) => + throw UnimplementedError(); + + @override + T _expect(String msg) => value; + + @override + void _expectErr(String msg) => throw UnimplementedError(); + + @override + U _fold(U Function(T left) fnL, U Function(void right) fnR) => fnL(value); + + @override + Future _foldAsync( + Future Function(T left) fnL, + Future Function(void right) fnR, + ) => + fnL(value); + + @override + _EitherBase _map(U Function(T left) mapper) => + Value(mapper(value)); + + @override + Future<_EitherBase> _mapAsync( + Future Function(T left) mapper, + ) => + mapper(value).then(Value.new); + + @override + _EitherBase _mapErr(F Function(void right) mapper) => + throw UnimplementedError(); + + @override + Future<_EitherBase> _mapErrAsync( + Future Function(void right) mapper, + ) => + throw UnimplementedError(); + + @override + _EitherBase _or(_EitherBase res) => this as _EitherBase; +} + +class None extends Option with _Right { + /// {@macro ok} + const None() : super._(); + + @override + _EitherBase _and(_EitherBase res) => this as Option; + + @override + bool _contains(U x) => false; + + @override + _EitherBase _either( + L Function(T left) fnL, + R Function(void right) fnR, + ) => + throw UnimplementedError(); + + @override + Future<_EitherBase> _eitherAsync( + Future Function(T left) fnL, + Future Function(void right) fnR, + ) => + throw UnimplementedError(); + + @override + T _expect(String msg) => throw OptionException(msg); + + @override + void _expectErr(String msg) => throw UnimplementedError(); + + @override + U _fold(U Function(T left) fnL, U Function(void right) fnR) => fnR(null); + + @override + Future _foldAsync( + Future Function(T left) fnL, + Future Function(void right) fnR, + ) => + fnR(null); + + @override + _EitherBase _map(U Function(T left) mapper) => None(); + + @override + Future<_EitherBase> _mapAsync( + Future Function(T left) mapper, + ) => + Future.value(None()); + + @override + _EitherBase _mapErr(F Function(void right) mapper) => + throw UnimplementedError(); + + @override + Future<_EitherBase> _mapErrAsync( + Future Function(void right) mapper, + ) => + throw UnimplementedError(); + + @override + _EitherBase _or(_EitherBase res) => res; +} diff --git a/packages/wyatt_type_utils/lib/src/result.dart b/packages/wyatt_type_utils/lib/src/result.dart new file mode 100644 index 00000000..4756f970 --- /dev/null +++ b/packages/wyatt_type_utils/lib/src/result.dart @@ -0,0 +1,327 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// ignore_for_file: avoid_positional_boolean_parameters + +part of 'either_base.dart'; + +/// {@template result_exception} +/// [ResultException] is sometimes threw by [Result] objects. +/// +/// ```dart +/// throw ResultException('Emergency failure!'); +/// ``` +/// {@endtemplate} +class ResultException extends _EitherBaseException { + /// {@macro result_exception} + const ResultException(super.message); + + @override + String toString() => 'ResultException: $message'; +} + +/// {@template result} +/// [Result] type is coming from functional languages where exceptions are +/// (rightfully) considered a side-effect, and therefore not appropriate to +/// pass domain errors. Mind the difference between different kinds of errors: +/// Some of them belong to domain, others don't. +/// +/// *E.g. null reference exception or index out of bounds +/// are not related to domain - they rather indicate a defect.* +/// +/// Either is defined as a generic type with two branches +/// - success with [T] +/// - failure with [E] +/// +/// It can appear in two forms, where +/// it contains an object of [Ok], or where it contains an object +/// of [Err]. It cannot appear in both states at once, or in none of them. +/// Therefore, if one possesses an [Result] instance, it either contains a +/// successfully produced result, or contains an error object. +/// {@endtemplate} +abstract class Result extends _EitherBase { + /// {@macro result} + const Result._(); + + /// Represents the left side of [Result] class. + bool get isOk => _isLeft; + + /// Represents the right side of [Result] class. + bool get isErr => _isRight; + + /// Get nullable [Ok] value, and discarding the error, if any. + T? get ok => _left; + + /// Get nullable [Err] value, and discarding the success value, if any. + E? get err => _right; + + /// Get [U] value, may throw an exception. + U unwrap() => _unwrap(); + + /// Get **async** [U] value, may throw an exception. + Future unwrapAsync() => _unwrapAsync(); + + /// Fold [Ok] and [Err] into the value of one type + U fold( + U Function(T value) valueTransformer, + U Function(E error) errorTransformer, + ) => + _fold( + (left) => valueTransformer(left), + (right) => errorTransformer(right), + ); + + /// Fold [Ok] and [Err] **asynchronously** into the value of one type + Future foldAsync( + Future Function(T value) valueTransformer, + Future Function(E error) errorTransformer, + ) => + _foldAsync( + (left) => valueTransformer(left), + (right) => errorTransformer(right), + ); + + /// Swap [Ok] and [Err] + Result swap() => fold(Err.new, Ok.new); + + /// Returns [res] if the [Result] is [Ok], otherwise returns + /// the [Err] value of this. + Result and(Result res) => _and(res) as Result; + + /// Returns [res] if the [Result] is [Err], otherwise returns + /// the [Ok] value of this. + Result or(Result res) => _or(res) as Result; + + /// Returns true if the result is an [Ok] or [Err] value containing + /// the given value/error. + bool contains(U x) => _contains(x); + + /// Returns the contained [Ok] value. Throw [ResultException] on [Err] with + /// its content. + T expect(String msg) => _expect(msg); + + /// Returns the contained [Err] value. Throw [ResultException] on [Ok] with + /// its content. + E expectErr(String msg) => _expectErr(msg); + + /// Maps a [Result] to [Result] by applying a function to a + /// contained [Ok] value, leaving an [Err] value untouched. + Result map(U Function(T value) mapper) => + _map(mapper) as Result; + + /// Maps a [Result] to [Result] by applying an **async** function + /// to a contained [Ok] value, leaving an [Err] value untouched. + Future> mapAsync(Future Function(T value) mapper) => + _mapAsync(mapper) as Future>; + + /// Maps a [Result] to [Result] by applying a function to a + /// contained [Err] value, leaving an [Ok] value untouched. + Result mapErr(F Function(E error) mapper) => + _mapErr(mapper) as Result; + + /// Maps a [Result] to [Result] by applying an **async** function + /// to a contained [Err] value, leaving an [Ok] value untouched. + Future> mapErrAsync(Future Function(E error) mapper) => + _mapErrAsync(mapper) as Future>; + + /// Transforms a [Result] to [Result] by applying functions to + /// contained [Ok] and [Err] values. + Result either( + U Function(T value) valueTransformer, + F Function(E error) errorTransformer, + ) => + _either(valueTransformer, errorTransformer) as Result; + + /// Transforms a [Result] to [Result] by applying **async** + /// functions to contained [Ok] and [Err] values. + Future> eitherAsync( + Future Function(T value) valueTransformer, + Future Function(E error) errorTransformer, + ) => + _eitherAsync(valueTransformer, errorTransformer) + as Future>; + + /// Constructs a new [Result] from a function that might throw + static Result tryCatch( + T Function() tryFn, + E Function(Error error) onError, + ) { + try { + return Ok(tryFn()); + } on Error catch (e) { + return Err(onError(e)); + } + } + + /// Constructs a new [Result] from an **async** function that might throw + static Future> tryCatchAsync( + Future Function() tryFn, + E Function(Error error) onError, + ) async { + try { + return Ok(await tryFn()); + } on Error catch (e) { + return Err(onError(e)); + } + } + + /// If the condition is satify then return [value] in + /// [Ok] else [error] in [Err] + static Result conditional( + bool test, + T value, + E error, + ) => + test ? Ok(value) : Err(error); + + /// If the condition is satify then return *command* [value] + /// in [Ok] else [error] in [Err] + static Result conditionalLazy( + bool test, + T Function() value, + E Function() error, + ) => + test ? Ok(value()) : Err(error()); +} + +/// {@template ok} +/// Contains the success value of a [Result] +/// +/// {@macro result} +/// {@endtemplate} +class Ok extends Result with _Left { + final T value; + + /// {@macro ok} + const Ok(this.value) : super._(); + + @override + U _fold(U Function(T left) fnL, U Function(E right) fnR) => fnL(value); + + @override + Future _foldAsync( + Future Function(T left) fnL, + Future Function(E right) fnR, + ) => + fnL(value); + + @override + Result _and(_EitherBase res) => res as Result; + + @override + Result _or(_EitherBase res) => this as Result; + + @override + bool _contains(U x) => value == x; + + @override + T _expect(String msg) => value; + + @override + E _expectErr(String msg) => throw ResultException('$msg: $value'); + + @override + Result _map(U Function(T value) mapper) => Ok(mapper(value)); + + @override + Future> _mapAsync(Future Function(T value) mapper) => + mapper(value).then(Ok.new); + + @override + Result _mapErr(F Function(E error) mapper) => Ok(value); + + @override + Future> _mapErrAsync(Future Function(E error) mapper) => + Future.value(Ok(value)); + + @override + Result _either( + U Function(T value) fnL, + F Function(E error) fnR, + ) => + Ok(fnL(value)); + + @override + Future> _eitherAsync( + Future Function(T value) fnL, + Future Function(E error) fnR, + ) => + fnL(value).then(Ok.new); +} + +/// {@template err} +/// Contains the error value of a [Result] +/// +/// {@macro result} +/// {@endtemplate} +class Err extends Result with _Right { + final E error; + + /// {@macro err} + const Err(this.error) : super._(); + + @override + U _fold(U Function(T left) fnL, U Function(E right) fnR) => fnR(error); + + @override + Future _foldAsync( + Future Function(T left) fnL, + Future Function(E right) fnR, + ) => + fnR(error); + + @override + Result _and(_EitherBase res) => this as Result; + @override + Result _or(_EitherBase res) => res as Result; + + @override + bool _contains(U x) => error == x; + + @override + T _expect(String msg) => throw ResultException('$msg: $error'); + + @override + E _expectErr(String msg) => error; + + @override + Result _map(U Function(T value) mapper) => Err(error); + + @override + Future> _mapAsync(Future Function(T value) mapper) => + Future.value(Err(error)); + + @override + Result _mapErr(F Function(E error) mapper) => Err(mapper(error)); + + @override + Future> _mapErrAsync(Future Function(E error) mapper) => + mapper(error).then(Err.new); + + @override + Result _either( + U Function(T value) fnL, + F Function(E error) fnR, + ) => + Err(fnR(error)); + + @override + Future> _eitherAsync( + Future Function(T value) fnL, + Future Function(E error) fnR, + ) => + fnR(error).then(Err.new); +} diff --git a/packages/wyatt_type_utils/lib/src/src.dart b/packages/wyatt_type_utils/lib/src/src.dart new file mode 100644 index 00000000..28295d72 --- /dev/null +++ b/packages/wyatt_type_utils/lib/src/src.dart @@ -0,0 +1,17 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +export 'either_base.dart'; diff --git a/packages/wyatt_type_utils/lib/wyatt_type_utils.dart b/packages/wyatt_type_utils/lib/wyatt_type_utils.dart new file mode 100644 index 00000000..fa4004b5 --- /dev/null +++ b/packages/wyatt_type_utils/lib/wyatt_type_utils.dart @@ -0,0 +1,20 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +/// Type Utils +library wyatt_type_utils; + +export 'src/src.dart'; diff --git a/packages/wyatt_type_utils/pubspec.yaml b/packages/wyatt_type_utils/pubspec.yaml index 0fed0bb2..1fc28a4c 100644 --- a/packages/wyatt_type_utils/pubspec.yaml +++ b/packages/wyatt_type_utils/pubspec.yaml @@ -1,5 +1,5 @@ name: wyatt_type_utils -description: Either, Optional and other useful types. +description: Either, Option and other useful types. repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_type_utils version: 0.0.1 diff --git a/packages/wyatt_type_utils/test/option_test.dart b/packages/wyatt_type_utils/test/option_test.dart new file mode 100644 index 00000000..6e11031d --- /dev/null +++ b/packages/wyatt_type_utils/test/option_test.dart @@ -0,0 +1,280 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'package:test/test.dart'; +import 'package:wyatt_type_utils/src/either_base.dart'; + +void main() { + group('Option', () { + test('`isPresent` returns true on not null value', () { + expect( + const Value(10).isPresent, + true, + ); + expect( + const None().isPresent, + false, + ); + }); + + test('`isNull` returns true on null value', () { + expect( + const Value(10).isNull, + false, + ); + expect( + const None().isNull, + true, + ); + }); + + test('`get` returns value', () { + const Option x = Value(2); + expect(x.get(), 2); + + const Option y = None(); + expect(y.get(), null); + }); + + test('unwrap() returns value on Value', () { + const Option x = Value(2); + expect(x.unwrap(), 2); + expect(() => x.unwrap(), throwsA(isException)); + }); + + test('unwrap() throws on None', () { + const Option x = None(); + expect(() => x.unwrap(), throwsA(isException)); + }); + + test('unwrapAsync() returns value on Value', () async { + const Option x = Value(2); + expect(await x.unwrapAsync(), 2); + expect(() async => x.unwrapAsync(), throwsA(isException)); + }); + + test('unwrapAsync() throws on Nonce', () async { + const Option x = None(); + expect(() async => x.unwrapAsync(), throwsA(isException)); + }); + + test('ifPresent() invokes command on Value', () { + const Value(2).ifPresent( + print, + ); + }); + + test('orElse() returns value', () { + expect( + const Value(10).orElse(12), + 10, + ); + + expect( + const None().orElse(12), + 12, + ); + }); + + test('orElseLazy() returns value', () { + expect( + const Value(10).orElseLazy(() => 12), + 10, + ); + + expect( + const None().orElseLazy(() => 12), + 12, + ); + }); + + test( + 'and() returns res if the option is `Value`, otherwise ' + 'returns `None`.', + () { + const Option x1 = Value(2); + const Option y1 = None(); + expect(x1.and(y1), y1); + + const Option x2 = None(); + const Option y2 = Value('foo'); + expect(x2.and(y2), x2); + + const Option x3 = None(); + const Option y3 = None(); + expect(x3.and(y3), x3); + + const Option x4 = Value(2); + const Option y4 = Value('different Option type'); + expect(x4.and(y4), y4); + + const Option x5 = Value(2); + const Option y5 = Value(5); + expect(x5.and(y5), y5); + }, + ); + + test( + 'or() returns res if the option is `None`, otherwise ' + 'returns the `Value`.', + () { + const Option x1 = Value(2); + const Option y1 = None(); + expect(x1.or(y1), x1); + + const Option x2 = None(); + const Option y2 = Value('foo'); + expect(x2.or(y2), y2); + + const Option x3 = None(); + const Option y3 = None(); + expect(x3.or(y3), y3); + + const Option x4 = Value(2); + const Option y4 = Value('different result type'); + expect(x4.or(y4), x4); + + const Option x5 = Value(2); + const Option y5 = Value(5); + expect(x5.or(y5), x5); + }, + ); + + test( + 'contains() returns true if the option is ' + 'containing the given value.', + () { + const Option x1 = Value(2); + expect(x1.contains(2), true); + expect(x1.contains(3), false); + const Option x2 = None(); + expect(x2.contains(2), false); + }, + ); + + test( + 'expect() return value if the option is a Value ' + 'else throw Exception', + () { + const Option x1 = Value(2); + expect(x1.expect('Testing expect'), 2); + + const Option x2 = None(); + expect( + () => x2.expect('Testing expect'), + throwsA( + predicate( + (e) => e.message == ('Testing expect'), + ), + ), + ); + }, + ); + + test( + 'map() transforms Value.', + () { + const Option x1 = Value(true); + + expect(x1.get(), true); + expect(x1.map((value) => false).get(), false); + + const Option x2 = None(); + + expect(x2.map((value) => false).isNull, true); + }, + ); + + test( + 'mapAsync() transforms Value.', + () async { + const Option x1 = Value(true); + + expect(x1.get(), true); + expect( + (await x1.mapAsync((value) => Future.value(false))).get(), + false, + ); + + const Option x2 = None(); + + expect( + (await x2.mapAsync((value) => Future.value(false))).isNull, + true, + ); + }, + ); + + test( + 'of(T value) returns Option with Value', + () { + final Option x1 = Option.of(2); + expect(x1.contains(2), true); + expect(x1.contains(3), false); + expect( + () => Option.of(null), + throwsA( + predicate( + (e) => e.message == ("Value can' be null. Use `ofNullable()`"), + ), + ), + ); + }, + ); + + test( + "ofNullable(T value) returns Option with Value and don't throw on Null", + () { + final Option x1 = Option.ofNullable(2); + expect(x1.contains(2), true); + expect(x1.contains(3), false); + + final Option x2 = Option.ofNullable(null); + expect(x2.isNull, true); + }, + ); + + test( + 'ofLazy() returns Option with Value', + () { + final Option x1 = Option.ofLazy(() => 2); + expect(x1.contains(2), true); + expect(x1.contains(3), false); + expect( + () => Option.ofLazy(() => null), + throwsA( + predicate( + (e) => + e.message == ("Value can' be null. Use `ofNullableLazy()`"), + ), + ), + ); + }, + ); + + test( + "ofNullableLazy() returns Option with Value and don't throw on Null", + () { + final Option x1 = Option.ofNullableLazy(() => 2); + expect(x1.contains(2), true); + expect(x1.contains(3), false); + + final Option x2 = Option.ofNullableLazy(() => null); + expect(x2.isNull, true); + }, + ); + }); +} diff --git a/packages/wyatt_type_utils/test/result_test.dart b/packages/wyatt_type_utils/test/result_test.dart new file mode 100644 index 00000000..5bdc8b0f --- /dev/null +++ b/packages/wyatt_type_utils/test/result_test.dart @@ -0,0 +1,425 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'package:test/test.dart'; +import 'package:wyatt_type_utils/src/either_base.dart'; + +void main() { + group('Result', () { + test('`isOk` returns true on Ok value', () { + expect( + const Ok(null).isOk, + true, + ); + expect( + const Err(null).isOk, + false, + ); + }); + + test('`isErr` returns true on Err value', () { + expect( + const Ok(null).isErr, + false, + ); + expect( + const Err(null).isErr, + true, + ); + }); + + test('`ok` returns value on Ok value', () { + const Result x = Ok(2); + expect(x.ok, 2); + expect(x.err, null); + }); + + test('`err` returns error on Err value', () { + const Result x = Err('error'); + expect(x.ok, null); + expect(x.err, 'error'); + }); + + test('unwrap() returns value on Ok value', () { + const Result x = Ok(2); + expect(x.unwrap(), 2); + expect(() => x.unwrap(), throwsA(isException)); + }); + + test('unwrap() returns error on Err value', () { + const Result x = Err('error'); + expect(x.unwrap(), 'error'); + expect(() => x.unwrap(), throwsA(isException)); + }); + + test('unwrapAsync() returns value on Ok value', () async { + const Result x = Ok(2); + expect(await x.unwrapAsync(), 2); + expect(() async => x.unwrapAsync(), throwsA(isException)); + }); + + test('unwrapAsync() returns error on Err value', () async { + const Result x = Err('error'); + expect(await x.unwrapAsync(), 'error'); + expect(() async => x.unwrapAsync(), throwsA(isException)); + }); + + test('fold() returns right value', () { + expect( + const Ok('') + .fold((left) => true, (right) => false), + true, + ); + expect( + const Err('') + .fold((left) => true, (right) => false), + false, + ); + }); + + test('foldAsync() returns right value', () async { + expect( + await const Ok('').foldAsync( + (left) => Future.value(true), + (right) => Future.value(false), + ), + true, + ); + expect( + await const Err('').foldAsync( + (left) => Future.value(true), + (right) => Future.value(false), + ), + false, + ); + }); + + test('swap() swaps values', () { + const Result x = Ok(10); + expect(x.isOk, true); + expect(x.isErr, false); + expect(x.ok, 10); + final Result y = x.swap(); + expect(y.isOk, false); + expect(y.isErr, true); + expect(y.err, 10); + }); + + test( + 'and() returns res if the result is `Ok`, otherwise ' + 'returns the `Err` value of this.', + () { + const Result x1 = Ok(2); + const Result y1 = Err('late error'); + expect(x1.and(y1), y1); + + const Result x2 = Err('early error'); + const Result y2 = Ok('foo'); + expect(x2.and(y2), x2); + + const Result x3 = Err('not a 2'); + const Result y3 = Err('late error'); + expect(x3.and(y3), x3); + + const Result x4 = Ok(2); + const Result y4 = Ok('different result type'); + expect(x4.and(y4), y4); + + const Result x5 = Ok(2); + const Result y5 = Ok(5); + expect(x5.and(y5), y5); + }, + ); + + test( + 'or() returns res if the result is `Err`, otherwise ' + 'returns the `Ok` value of this.', + () { + const Result x1 = Ok(2); + const Result y1 = Err('late error'); + expect(x1.or(y1), x1); + + const Result x2 = Err('early error'); + const Result y2 = Ok('foo'); + expect(x2.or(y2), y2); + + const Result x3 = Err('not a 2'); + const Result y3 = Err('late error'); + expect(x3.or(y3), y3); + + const Result x4 = Ok(2); + const Result y4 = Ok('different result type'); + expect(x4.or(y4), x4); + + const Result x5 = Ok(2); + const Result y5 = Ok(5); + expect(x5.or(y5), x5); + }, + ); + + test( + 'contains() returns true if the result is an Ok value ' + 'containing the given value.', + () { + const Result x1 = Ok(2); + expect(x1.contains(2), true); + expect(x1.contains(3), false); + const Result x2 = Err('Some error message'); + expect(x2.contains(2), false); + }, + ); + + test( + 'expect() return value if the result is an Ok value ' + 'else throw Exception', + () { + const Result x1 = Ok(2); + expect(x1.expect('Testing expect'), 2); + + const Result x2 = Err('emergency failure'); + expect( + () => x2.expect('Testing expect'), + throwsA( + predicate( + (e) => e.message == ('Testing expect: emergency failure'), + ), + ), + ); + }, + ); + + test( + 'expectErr() return value if the result is an Err value ' + 'else throw Exception', + () { + const Result x1 = Err(2); + expect(x1.expectErr('Testing expect err'), 2); + + const Result x2 = Ok('success value'); + expect( + () => x2.expectErr('Testing expect err'), + throwsA( + predicate( + (e) => e.message == ('Testing expect err: success value'), + ), + ), + ); + }, + ); + + test( + 'map() transforms Ok value.', + () { + const Result x1 = Ok(true); + + expect(x1.ok, true); + expect(x1.map((value) => false).ok, false); + + const Result x2 = Err('oops'); + + expect(x2.map((value) => false).isErr, true); + }, + ); + + test( + 'mapErr() transforms Err value.', + () { + const Result x1 = Ok(true); + + expect(x1.mapErr((value) => false).isOk, true); + + const Result x2 = Err('oops'); + + expect(x2.err, 'oops'); + expect(x2.mapErr((error) => 'failure').err, 'failure'); + }, + ); + + test( + 'mapAsync() transforms Ok value.', + () async { + const Result x1 = Ok(true); + + expect(x1.ok, true); + expect((await x1.mapAsync((value) => Future.value(false))).ok, false); + + const Result x2 = Err('oops'); + + expect((await x2.mapAsync((value) => Future.value(false))).isErr, true); + }, + ); + + test( + 'mapErrAsync() transforms Err value.', + () async { + const Result x1 = Ok(true); + + expect( + (await x1.mapErrAsync((value) => Future.value(false))).isOk, + true, + ); + + const Result x2 = Err('oops'); + + expect(x2.err, 'oops'); + expect( + (await x2.mapErrAsync((error) => Future.value('failure'))).err, + 'failure', + ); + }, + ); + + test( + 'either() transforms values.', + () { + const Result x1 = Ok(true); + final Result y1 = + x1.either((value) => 1, (error) => 'error'); + + expect(y1.isOk, true); + expect(y1.ok, 1); + + const Result x2 = Err(true); + final Result y2 = + x2.either((value) => 1, (error) => 'error'); + + expect(y2.isErr, true); + expect(y2.err, 'error'); + }, + ); + + test( + 'eitherAsync() transforms values.', + () async { + const Result x1 = Ok(true); + final Result y1 = await x1.eitherAsync( + (value) => Future.value(1), + (error) => Future.value('error'), + ); + + expect(y1.isOk, true); + expect(y1.ok, 1); + + const Result x2 = Err(true); + final Result y2 = await x2.eitherAsync( + (value) => Future.value(1), + (error) => Future.value('error'), + ); + + expect(y2.isErr, true); + expect(y2.err, 'error'); + }, + ); + + test( + 'tryCatch() try and catch error as Err.', + () { + expect( + Result.tryCatch( + () => throw Exception('not success'), + (err) => 'error', + ).isErr, + true, + ); + expect( + Result.tryCatch( + () => 2, + (err) => 'error', + ).isOk, + true, + ); + }, + ); + + test( + 'tryCatchAsync() try and catch error as Err.', + () async { + expect( + (await Result.tryCatchAsync( + () => throw Exception('not success'), + (err) => 'error', + )).isErr, + true, + ); + expect( + (await Result.tryCatchAsync( + () => Future.value(2), + (err) => 'error', + )).isOk, + true, + ); + }, + ); + + test( + 'conditional() returns Result on true test', + () { + final Result x1 = Result.conditional( + false, + 2, + 'error', + ); + expect( + x1.isErr, + true, + ); + + expect(x1.err, 'error'); + + final Result x2 = Result.conditional( + true, + 2, + 'error', + ); + expect( + x2.isOk, + true, + ); + + expect(x2.ok, 2); + }, + ); + + test( + 'conditionalLazy() returns Result on true test', + () { + final Result x1 = Result.conditionalLazy( + false, + () => 2, + () => 'error', + ); + expect( + x1.isErr, + true, + ); + + expect(x1.err, 'error'); + + final Result x2 = Result.conditionalLazy( + true, + () => 2, + () => 'error', + ); + expect( + x2.isOk, + true, + ); + + expect(x2.ok, 2); + }, + ); + }); +} From ec5e65ac827b60f1c1c3aafde210b8a9e90bf652 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Mon, 18 Jul 2022 16:56:48 +0200 Subject: [PATCH 03/12] docs: remove useless web example --- .../wyatt_type_utils/example/web/favicon.png | Bin 917 -> 0 bytes .../example/web/icons/Icon-192.png | Bin 5292 -> 0 bytes .../example/web/icons/Icon-512.png | Bin 8252 -> 0 bytes .../example/web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes .../example/web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes .../wyatt_type_utils/example/web/index.html | 58 ------------------ .../example/web/manifest.json | 35 ----------- 7 files changed, 93 deletions(-) delete mode 100644 packages/wyatt_type_utils/example/web/favicon.png delete mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-192.png delete mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-512.png delete mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-maskable-192.png delete mode 100644 packages/wyatt_type_utils/example/web/icons/Icon-maskable-512.png delete mode 100644 packages/wyatt_type_utils/example/web/index.html delete mode 100644 packages/wyatt_type_utils/example/web/manifest.json diff --git a/packages/wyatt_type_utils/example/web/favicon.png b/packages/wyatt_type_utils/example/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-192.png b/packages/wyatt_type_utils/example/web/icons/Icon-192.png deleted file mode 100644 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 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 diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-512.png b/packages/wyatt_type_utils/example/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 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 diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-maskable-192.png b/packages/wyatt_type_utils/example/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 zcmdT|`#%%j|KDb2V@0DPm$^(Lx5}lO%Yv(=e*7hl@QqKS50#~#^IQPxBmuh|i9sXnt4ch@VT0F7% zMtrs@KWIOo+QV@lSs66A>2pz6-`9Jk=0vv&u?)^F@HZ)-6HT=B7LF;rdj zskUyBfbojcX#CS>WrIWo9D=DIwcXM8=I5D{SGf$~=gh-$LwY?*)cD%38%sCc?5OsX z-XfkyL-1`VavZ?>(pI-xp-kYq=1hsnyP^TLb%0vKRSo^~r{x?ISLY1i7KjSp z*0h&jG(Rkkq2+G_6eS>n&6>&Xk+ngOMcYrk<8KrukQHzfx675^^s$~<@d$9X{VBbg z2Fd4Z%g`!-P}d#`?B4#S-9x*eNlOVRnDrn#jY@~$jfQ-~3Od;A;x-BI1BEDdvr`pI z#D)d)!2_`GiZOUu1crb!hqH=ezs0qk<_xDm_Kkw?r*?0C3|Io6>$!kyDl;eH=aqg$B zsH_|ZD?jP2dc=)|L>DZmGyYKa06~5?C2Lc0#D%62p(YS;%_DRCB1k(+eLGXVMe+=4 zkKiJ%!N6^mxqM=wq`0+yoE#VHF%R<{mMamR9o_1JH8jfnJ?NPLs$9U!9!dq8 z0B{dI2!M|sYGH&9TAY34OlpIsQ4i5bnbG>?cWwat1I13|r|_inLE?FS@Hxdxn_YZN z3jfUO*X9Q@?HZ>Q{W0z60!bbGh557XIKu1?)u|cf%go`pwo}CD=0tau-}t@R2OrSH zQzZr%JfYa`>2!g??76=GJ$%ECbQh7Q2wLRp9QoyiRHP7VE^>JHm>9EqR3<$Y=Z1K^SHuwxCy-5@z3 zVM{XNNm}yM*pRdLKp??+_2&!bp#`=(Lh1vR{~j%n;cJv~9lXeMv)@}Odta)RnK|6* zC+IVSWumLo%{6bLDpn)Gz>6r&;Qs0^+Sz_yx_KNz9Dlt^ax`4>;EWrIT#(lJ_40<= z750fHZ7hI{}%%5`;lwkI4<_FJw@!U^vW;igL0k+mK)-j zYuCK#mCDK3F|SC}tC2>m$ZCqNB7ac-0UFBJ|8RxmG@4a4qdjvMzzS&h9pQmu^x&*= zGvapd1#K%Da&)8f?<9WN`2H^qpd@{7In6DNM&916TRqtF4;3`R|Nhwbw=(4|^Io@T zIjoR?tB8d*sO>PX4vaIHF|W;WVl6L1JvSmStgnRQq zTX4(>1f^5QOAH{=18Q2Vc1JI{V=yOr7yZJf4Vpfo zeHXdhBe{PyY;)yF;=ycMW@Kb>t;yE>;f79~AlJ8k`xWucCxJfsXf2P72bAavWL1G#W z;o%kdH(mYCM{$~yw4({KatNGim49O2HY6O07$B`*K7}MvgI=4x=SKdKVb8C$eJseA$tmSFOztFd*3W`J`yIB_~}k%Sd_bPBK8LxH)?8#jM{^%J_0|L z!gFI|68)G}ex5`Xh{5pB%GtlJ{Z5em*e0sH+sU1UVl7<5%Bq+YrHWL7?X?3LBi1R@_)F-_OqI1Zv`L zb6^Lq#H^2@d_(Z4E6xA9Z4o3kvf78ZDz!5W1#Mp|E;rvJz&4qj2pXVxKB8Vg0}ek%4erou@QM&2t7Cn5GwYqy%{>jI z)4;3SAgqVi#b{kqX#$Mt6L8NhZYgonb7>+r#BHje)bvaZ2c0nAvrN3gez+dNXaV;A zmyR0z@9h4@6~rJik-=2M-T+d`t&@YWhsoP_XP-NsVO}wmo!nR~QVWU?nVlQjNfgcTzE-PkfIX5G z1?&MwaeuzhF=u)X%Vpg_e@>d2yZwxl6-r3OMqDn8_6m^4z3zG##cK0Fsgq8fcvmhu z{73jseR%X%$85H^jRAcrhd&k!i^xL9FrS7qw2$&gwAS8AfAk#g_E_tP;x66fS`Mn@SNVrcn_N;EQm z`Mt3Z%rw%hDqTH-s~6SrIL$hIPKL5^7ejkLTBr46;pHTQDdoErS(B>``t;+1+M zvU&Se9@T_BeK;A^p|n^krIR+6rH~BjvRIugf`&EuX9u69`9C?9ANVL8l(rY6#mu^i z=*5Q)-%o*tWl`#b8p*ZH0I}hn#gV%|jt6V_JanDGuekR*-wF`u;amTCpGG|1;4A5$ zYbHF{?G1vv5;8Ph5%kEW)t|am2_4ik!`7q{ymfHoe^Z99c|$;FAL+NbxE-_zheYbV z3hb0`uZGTsgA5TG(X|GVDSJyJxsyR7V5PS_WSnYgwc_D60m7u*x4b2D79r5UgtL18 zcCHWk+K6N1Pg2c;0#r-)XpwGX?|Iv)^CLWqwF=a}fXUSM?n6E;cCeW5ER^om#{)Jr zJR81pkK?VoFm@N-s%hd7@hBS0xuCD0-UDVLDDkl7Ck=BAj*^ps`393}AJ+Ruq@fl9 z%R(&?5Nc3lnEKGaYMLmRzKXow1+Gh|O-LG7XiNxkG^uyv zpAtLINwMK}IWK65hOw&O>~EJ}x@lDBtB`yKeV1%GtY4PzT%@~wa1VgZn7QRwc7C)_ zpEF~upeDRg_<#w=dLQ)E?AzXUQpbKXYxkp>;c@aOr6A|dHA?KaZkL0svwB^U#zmx0 zzW4^&G!w7YeRxt<9;d@8H=u(j{6+Uj5AuTluvZZD4b+#+6Rp?(yJ`BC9EW9!b&KdPvzJYe5l7 zMJ9aC@S;sA0{F0XyVY{}FzW0Vh)0mPf_BX82E+CD&)wf2!x@{RO~XBYu80TONl3e+ zA7W$ra6LcDW_j4s-`3tI^VhG*sa5lLc+V6ONf=hO@q4|p`CinYqk1Ko*MbZ6_M05k zSwSwkvu;`|I*_Vl=zPd|dVD0lh&Ha)CSJJvV{AEdF{^Kn_Yfsd!{Pc1GNgw}(^~%)jk5~0L~ms|Rez1fiK~s5t(p1ci5Gq$JC#^JrXf?8 z-Y-Zi_Hvi>oBzV8DSRG!7dm|%IlZg3^0{5~;>)8-+Nk&EhAd(}s^7%MuU}lphNW9Q zT)DPo(ob{tB7_?u;4-qGDo!sh&7gHaJfkh43QwL|bbFVi@+oy;i;M zM&CP^v~lx1U`pi9PmSr&Mc<%HAq0DGH?Ft95)WY`P?~7O z`O^Nr{Py9M#Ls4Y7OM?e%Y*Mvrme%=DwQaye^Qut_1pOMrg^!5u(f9p(D%MR%1K>% zRGw%=dYvw@)o}Fw@tOtPjz`45mfpn;OT&V(;z75J*<$52{sB65$gDjwX3Xa!x_wE- z!#RpwHM#WrO*|~f7z}(}o7US(+0FYLM}6de>gQdtPazXz?OcNv4R^oYLJ_BQOd_l172oSK$6!1r@g+B@0ofJ4*{>_AIxfe-#xp>(1 z@Y3Nfd>fmqvjL;?+DmZk*KsfXJf<%~(gcLwEez%>1c6XSboURUh&k=B)MS>6kw9bY z{7vdev7;A}5fy*ZE23DS{J?8at~xwVk`pEwP5^k?XMQ7u64;KmFJ#POzdG#np~F&H ze-BUh@g54)dsS%nkBb}+GuUEKU~pHcYIg4vSo$J(J|U36bs0Use+3A&IMcR%6@jv$ z=+QI+@wW@?iu}Hpyzlvj-EYeop{f65GX0O%>w#0t|V z1-svWk`hU~m`|O$kw5?Yn5UhI%9P-<45A(v0ld1n+%Ziq&TVpBcV9n}L9Tus-TI)f zd_(g+nYCDR@+wYNQm1GwxhUN4tGMLCzDzPqY$~`l<47{+l<{FZ$L6(>J)|}!bi<)| zE35dl{a2)&leQ@LlDxLQOfUDS`;+ZQ4ozrleQwaR-K|@9T{#hB5Z^t#8 zC-d_G;B4;F#8A2EBL58s$zF-=SCr`P#z zNCTnHF&|X@q>SkAoYu>&s9v@zCpv9lLSH-UZzfhJh`EZA{X#%nqw@@aW^vPcfQrlPs(qQxmC|4tp^&sHy!H!2FH5eC{M@g;ElWNzlb-+ zxpfc0m4<}L){4|RZ>KReag2j%Ot_UKkgpJN!7Y_y3;Ssz{9 z!K3isRtaFtQII5^6}cm9RZd5nTp9psk&u1C(BY`(_tolBwzV_@0F*m%3G%Y?2utyS zY`xM0iDRT)yTyYukFeGQ&W@ReM+ADG1xu@ruq&^GK35`+2r}b^V!m1(VgH|QhIPDE X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! diff --git a/packages/wyatt_type_utils/example/web/icons/Icon-maskable-512.png b/packages/wyatt_type_utils/example/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20998 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 MPgg&ebxsLQ025IeI{*Lx diff --git a/packages/wyatt_type_utils/example/web/index.html b/packages/wyatt_type_utils/example/web/index.html deleted file mode 100644 index 41b3bc33..00000000 --- a/packages/wyatt_type_utils/example/web/index.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - example - - - - - - - - - - diff --git a/packages/wyatt_type_utils/example/web/manifest.json b/packages/wyatt_type_utils/example/web/manifest.json deleted file mode 100644 index 096edf8f..00000000 --- a/packages/wyatt_type_utils/example/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "example", - "short_name": "example", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -} From 5515c0e951b04360597d76d0773eeb99d1258abc Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Mon, 18 Jul 2022 16:58:32 +0200 Subject: [PATCH 04/12] chore(release): publish packages - wyatt_type_utils@0.0.2 --- CHANGELOG.md | 23 +++++++++++++++++++++++ packages/wyatt_type_utils/CHANGELOG.md | 6 ++++++ packages/wyatt_type_utils/pubspec.yaml | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dff046b7..82eb46d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2022-07-18 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`wyatt_type_utils` - `v0.0.2`](#wyatt_type_utils---v002) + +--- + +#### `wyatt_type_utils` - `v0.0.2` + + - **FEAT**: add strongly typed Option and Result. + - **FEAT**: add mason generated package. + - **DOCS**: remove useless web example. + + ## 2022-07-12 ### Changes diff --git a/packages/wyatt_type_utils/CHANGELOG.md b/packages/wyatt_type_utils/CHANGELOG.md index 7ad72ac3..4c5d679f 100644 --- a/packages/wyatt_type_utils/CHANGELOG.md +++ b/packages/wyatt_type_utils/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.0.2 + + - **FEAT**: add strongly typed Option and Result. + - **FEAT**: add mason generated package. + - **DOCS**: remove useless web example. + # 0.0.1 - TODO: Describe initial release. diff --git a/packages/wyatt_type_utils/pubspec.yaml b/packages/wyatt_type_utils/pubspec.yaml index 1fc28a4c..d4a84279 100644 --- a/packages/wyatt_type_utils/pubspec.yaml +++ b/packages/wyatt_type_utils/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_type_utils description: Either, Option and other useful types. repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_type_utils -version: 0.0.1 +version: 0.0.2 environment: sdk: '>=2.17.0 <3.0.0' From d6bb3c2ac787c977445138457a24e18fb5e70153 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Thu, 25 Aug 2022 17:36:44 +0200 Subject: [PATCH 05/12] chore(release): publish packages - wyatt_form_bloc@0.0.4 - wyatt_authentication_bloc@0.2.1+2 --- CHANGELOG.md | 28 +++++ .../wyatt_authentication_bloc/CHANGELOG.md | 4 + .../example/pubspec.yaml | 2 +- .../example_router/pubspec.yaml | 100 ++++++++++++++++++ .../wyatt_authentication_bloc/pubspec.yaml | 4 +- packages/wyatt_form_bloc/CHANGELOG.md | 4 + packages/wyatt_form_bloc/pubspec.yaml | 2 +- 7 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 packages/wyatt_authentication_bloc/example_router/pubspec.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 82eb46d3..a3182f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,34 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2022-08-25 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`wyatt_form_bloc` - `v0.0.4`](#wyatt_form_bloc---v004) + - [`wyatt_authentication_bloc` - `v0.2.1+2`](#wyatt_authentication_bloc---v0212) + +Packages with dependency updates only: + +> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project. + + - `wyatt_authentication_bloc` - `v0.2.1+2` + +--- + +#### `wyatt_form_bloc` - `v0.0.4` + + - **FEAT**: add form validator class with strategy design pattern. + + ## 2022-07-18 ### Changes diff --git a/packages/wyatt_authentication_bloc/CHANGELOG.md b/packages/wyatt_authentication_bloc/CHANGELOG.md index 54956623..b95e8941 100644 --- a/packages/wyatt_authentication_bloc/CHANGELOG.md +++ b/packages/wyatt_authentication_bloc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.1+2 + + - Update a dependency to the latest release. + ## 0.2.1+1 - Update a dependency to the latest release. diff --git a/packages/wyatt_authentication_bloc/example/pubspec.yaml b/packages/wyatt_authentication_bloc/example/pubspec.yaml index 78eb36ab..cab9087f 100644 --- a/packages/wyatt_authentication_bloc/example/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.3 + ref: wyatt_form_bloc-v0.0.4 path: packages/wyatt_form_bloc # The following adds the Cupertino Icons font to your application. diff --git a/packages/wyatt_authentication_bloc/example_router/pubspec.yaml b/packages/wyatt_authentication_bloc/example_router/pubspec.yaml new file mode 100644 index 00000000..361f7fe8 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/pubspec.yaml @@ -0,0 +1,100 @@ +name: example_router +description: A new Flutter project. + +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +version: 1.0.0+1 + +environment: + sdk: ">=2.17.6 <3.0.0" + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + go_router: ^4.2.8 + firebase_core: ^1.21.0 + flutter_bloc: ^8.1.1 + wyatt_authentication_bloc: + path: "../" + + wyatt_form_bloc: + git: + url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages + ref: wyatt_form_bloc-v0.0.4 + path: packages/wyatt_form_bloc + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.2 + +dev_dependencies: + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^2.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/wyatt_authentication_bloc/pubspec.yaml b/packages/wyatt_authentication_bloc/pubspec.yaml index 0a01eafc..e13356f2 100644 --- a/packages/wyatt_authentication_bloc/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_authentication_bloc description: Authentication BLoC for Flutter repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_authentication_bloc -version: 0.2.1+1 +version: 0.2.1+2 environment: sdk: ">=2.15.1 <3.0.0" @@ -23,7 +23,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.3 + ref: wyatt_form_bloc-v0.0.4 path: packages/wyatt_form_bloc diff --git a/packages/wyatt_form_bloc/CHANGELOG.md b/packages/wyatt_form_bloc/CHANGELOG.md index 78dde4f6..752b6b6d 100644 --- a/packages/wyatt_form_bloc/CHANGELOG.md +++ b/packages/wyatt_form_bloc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.4 + + - **FEAT**: add form validator class with strategy design pattern. + ## 0.0.3 - **FEAT**: add helpers. diff --git a/packages/wyatt_form_bloc/pubspec.yaml b/packages/wyatt_form_bloc/pubspec.yaml index 6fbe876a..2432f031 100644 --- a/packages/wyatt_form_bloc/pubspec.yaml +++ b/packages/wyatt_form_bloc/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_form_bloc description: Manage forms in Dart & Flutter with Bloc repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_form_bloc -version: 0.0.3 +version: 0.0.4 environment: sdk: '>=2.17.2 <3.0.0' From 57b951ed0a1b1b38f8c50b91131483f75aba7f96 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Thu, 25 Aug 2022 18:02:43 +0200 Subject: [PATCH 06/12] feat(form): update deps --- packages/wyatt_form_bloc/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wyatt_form_bloc/pubspec.yaml b/packages/wyatt_form_bloc/pubspec.yaml index 2432f031..14f4ffff 100644 --- a/packages/wyatt_form_bloc/pubspec.yaml +++ b/packages/wyatt_form_bloc/pubspec.yaml @@ -7,8 +7,8 @@ environment: sdk: '>=2.17.2 <3.0.0' dependencies: - bloc: ^8.0.3 - equatable: ^2.0.3 + bloc: ^8.1.0 + equatable: ^2.0.5 dev_dependencies: test: ^1.21.4 From 24ebdc008ca553d5a0a55515a591d615ba221c3a Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Thu, 25 Aug 2022 18:03:00 +0200 Subject: [PATCH 07/12] chore(release): publish packages - wyatt_form_bloc@0.0.5 - wyatt_authentication_bloc@0.2.1+3 --- CHANGELOG.md | 28 +++++++++++++++++++ .../wyatt_authentication_bloc/CHANGELOG.md | 4 +++ .../example/pubspec.yaml | 2 +- .../example_router/pubspec.yaml | 2 +- .../wyatt_authentication_bloc/pubspec.yaml | 4 +-- packages/wyatt_form_bloc/CHANGELOG.md | 4 +++ packages/wyatt_form_bloc/pubspec.yaml | 2 +- 7 files changed, 41 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3182f49..7d8415bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,34 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2022-08-25 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`wyatt_form_bloc` - `v0.0.5`](#wyatt_form_bloc---v005) + - [`wyatt_authentication_bloc` - `v0.2.1+3`](#wyatt_authentication_bloc---v0213) + +Packages with dependency updates only: + +> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project. + + - `wyatt_authentication_bloc` - `v0.2.1+3` + +--- + +#### `wyatt_form_bloc` - `v0.0.5` + + - **FEAT**: update deps. + + ## 2022-08-25 ### Changes diff --git a/packages/wyatt_authentication_bloc/CHANGELOG.md b/packages/wyatt_authentication_bloc/CHANGELOG.md index b95e8941..8c7c3ed5 100644 --- a/packages/wyatt_authentication_bloc/CHANGELOG.md +++ b/packages/wyatt_authentication_bloc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.1+3 + + - Update a dependency to the latest release. + ## 0.2.1+2 - Update a dependency to the latest release. diff --git a/packages/wyatt_authentication_bloc/example/pubspec.yaml b/packages/wyatt_authentication_bloc/example/pubspec.yaml index cab9087f..c8310524 100644 --- a/packages/wyatt_authentication_bloc/example/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.4 + ref: wyatt_form_bloc-v0.0.5 path: packages/wyatt_form_bloc # The following adds the Cupertino Icons font to your application. diff --git a/packages/wyatt_authentication_bloc/example_router/pubspec.yaml b/packages/wyatt_authentication_bloc/example_router/pubspec.yaml index 361f7fe8..e1d13fea 100644 --- a/packages/wyatt_authentication_bloc/example_router/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example_router/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.4 + ref: wyatt_form_bloc-v0.0.5 path: packages/wyatt_form_bloc # The following adds the Cupertino Icons font to your application. diff --git a/packages/wyatt_authentication_bloc/pubspec.yaml b/packages/wyatt_authentication_bloc/pubspec.yaml index e13356f2..ac4ae6aa 100644 --- a/packages/wyatt_authentication_bloc/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_authentication_bloc description: Authentication BLoC for Flutter repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_authentication_bloc -version: 0.2.1+2 +version: 0.2.1+3 environment: sdk: ">=2.15.1 <3.0.0" @@ -23,7 +23,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.4 + ref: wyatt_form_bloc-v0.0.5 path: packages/wyatt_form_bloc diff --git a/packages/wyatt_form_bloc/CHANGELOG.md b/packages/wyatt_form_bloc/CHANGELOG.md index 752b6b6d..0b12c175 100644 --- a/packages/wyatt_form_bloc/CHANGELOG.md +++ b/packages/wyatt_form_bloc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.5 + + - **FEAT**: update deps. + ## 0.0.4 - **FEAT**: add form validator class with strategy design pattern. diff --git a/packages/wyatt_form_bloc/pubspec.yaml b/packages/wyatt_form_bloc/pubspec.yaml index 14f4ffff..db0e8c1b 100644 --- a/packages/wyatt_form_bloc/pubspec.yaml +++ b/packages/wyatt_form_bloc/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_form_bloc description: Manage forms in Dart & Flutter with Bloc repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_form_bloc -version: 0.0.4 +version: 0.0.5 environment: sdk: '>=2.17.2 <3.0.0' From a1e36f84be704a2efce55c1bfd40ba6b733d53e5 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Fri, 26 Aug 2022 13:42:01 +0200 Subject: [PATCH 08/12] feat(form): add raw form validator --- .../wyatt_form_bloc/lib/src/form/form_validator.dart | 4 ++++ .../src/validators/form/every_input_validator.dart | 11 ++++++++--- .../lib/src/validators/validators.dart | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/wyatt_form_bloc/lib/src/form/form_validator.dart b/packages/wyatt_form_bloc/lib/src/form/form_validator.dart index 15cdc16a..958d4e3e 100644 --- a/packages/wyatt_form_bloc/lib/src/form/form_validator.dart +++ b/packages/wyatt_form_bloc/lib/src/form/form_validator.dart @@ -28,4 +28,8 @@ abstract class FormValidator { .every((validator) => validator.pure); FormStatus validate(FormData form); + + FormStatus rawValidate( + List> validators, + ); } diff --git a/packages/wyatt_form_bloc/lib/src/validators/form/every_input_validator.dart b/packages/wyatt_form_bloc/lib/src/validators/form/every_input_validator.dart index dccc622c..fba42286 100644 --- a/packages/wyatt_form_bloc/lib/src/validators/form/every_input_validator.dart +++ b/packages/wyatt_form_bloc/lib/src/validators/form/every_input_validator.dart @@ -29,9 +29,14 @@ class EveryInputValidator extends FormValidator { return FormStatus.pure; } - if (form - .validators() - .any((validator) => validator.valid == false)) { + return rawValidate(form.validators()); + } + + @override + FormStatus rawValidate( + List> validators, + ) { + if (validators.any((validator) => validator.valid == false)) { return FormStatus.invalid; } diff --git a/packages/wyatt_form_bloc/lib/src/validators/validators.dart b/packages/wyatt_form_bloc/lib/src/validators/validators.dart index ae73b127..b9eaa4b6 100644 --- a/packages/wyatt_form_bloc/lib/src/validators/validators.dart +++ b/packages/wyatt_form_bloc/lib/src/validators/validators.dart @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +export 'form/every_input_validator.dart'; export 'inputs/base/regex_validator.dart'; export 'inputs/base/text_validator.dart'; export 'inputs/boolean.dart'; From d9d45db5c0495fedb3b23d3617e78e66bab8027e Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Fri, 26 Aug 2022 13:42:53 +0200 Subject: [PATCH 09/12] feat(auth): add reactive repo + extra data + router examples + tests --- .../lib/sign_up/widgets/sign_up_form.dart | 6 +- .../example_router/.gitignore | 47 ++++++ .../example_router/.metadata | 30 ++++ .../example_router/.vscode/launch.json | 25 +++ .../example_router/README.md | 16 ++ .../example_router/analysis_options.yaml | 29 ++++ .../example_router/android/.gitignore | 13 ++ .../example_router/android/app/build.gradle | 74 +++++++++ .../android/app/src/debug/AndroidManifest.xml | 8 + .../android/app/src/main/AndroidManifest.xml | 34 ++++ .../example/example_router/MainActivity.kt | 6 + .../res/drawable-v21/launch_background.xml | 12 ++ .../main/res/drawable/launch_background.xml | 12 ++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 +++ .../app/src/main/res/values/styles.xml | 18 +++ .../app/src/profile/AndroidManifest.xml | 8 + .../example_router/android/build.gradle | 34 ++++ .../example_router/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 6 + .../example_router/android/settings.gradle | 11 ++ .../example_router/lib/bootstrap.dart | 40 +++++ .../lib/core/constants/form_field.dart | 12 ++ .../lib/core/routes/router.dart | 79 ++++++++++ .../lib/core/utils/app_bloc_observer.dart | 37 +++++ .../example_router/lib/core/utils/forms.dart | 21 +++ .../example_router/lib/firebase_options.dart | 63 ++++++++ .../example_router/lib/main.dart | 6 + .../lib/presentation/features/app/app.dart | 115 ++++++++++++++ .../presentation/features/home/home_page.dart | 55 +++++++ .../features/sign_in/sign_in_page.dart | 30 ++++ .../sign_in/widgets/sign_in_form.dart | 105 ++++++++++++ .../features/sign_up/sign_up_page.dart | 30 ++++ .../sign_up/widgets/sign_up_form.dart | 149 ++++++++++++++++++ .../presentation/features/sub/sub_page.dart | 38 +++++ .../features/welcome/welcome_page.dart | 53 +++++++ .../example_router/test/widget_test.dart | 0 .../cubit/authentication_cubit.dart | 76 --------- .../enum/auth_cubit_status.dart} | 6 +- .../exceptions/exceptions.dart} | 0 .../exceptions/exceptions_firebase.dart | 48 +++--- .../extensions/firebase_auth_user_x.dart} | 8 +- .../src/{ => core}/utils/cryptography.dart | 0 .../user => data/models}/user_firebase.dart | 11 +- .../authentication_repository_firebase.dart | 60 +++---- .../entities/user.dart} | 4 +- .../authentication_repository.dart} | 25 +-- .../authentication/authentication.dart | 0 .../builder/authentication_builder.dart | 43 +++-- .../cubit/authentication_cubit.dart | 98 ++++++++++++ .../cubit/authentication_state.dart | 19 ++- .../cubit/email_verification_cubit.dart | 14 +- .../cubit/email_verification_state.dart | 4 +- .../email_verification.dart | 0 .../cubit/password_reset_cubit.dart | 24 ++- .../cubit/password_reset_state.dart | 4 +- .../password_reset/password_reset.dart | 0 .../sign_in/cubit/sign_in_cubit.dart | 33 ++-- .../sign_in/cubit/sign_in_state.dart | 19 +-- .../src/{ => features}/sign_in/sign_in.dart | 0 .../sign_up/cubit/sign_up_cubit.dart | 76 +++++---- .../sign_up/cubit/sign_up_state.dart | 48 ++---- .../src/{ => features}/sign_up/sign_up.dart | 0 .../lib/src/models/exceptions/exceptions.dart | 18 --- .../lib/src/models/models.dart | 18 --- .../lib/src/src.dart | 21 ++- .../wyatt_authentication_bloc/pubspec.yaml | 3 +- .../authentication_cubit_test.dart | 73 ++++++--- .../authentication_state_test.dart | 19 ++- .../test/sign_in/sign_in_cubit_test.dart | 35 ++-- .../test/sign_up/sign_up_cubit_test.dart | 57 +++---- 75 files changed, 1673 insertions(+), 434 deletions(-) create mode 100644 packages/wyatt_authentication_bloc/example_router/.gitignore create mode 100644 packages/wyatt_authentication_bloc/example_router/.metadata create mode 100644 packages/wyatt_authentication_bloc/example_router/.vscode/launch.json create mode 100644 packages/wyatt_authentication_bloc/example_router/README.md create mode 100644 packages/wyatt_authentication_bloc/example_router/analysis_options.yaml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/.gitignore create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/build.gradle create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/debug/AndroidManifest.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/AndroidManifest.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/kotlin/com/example/example_router/MainActivity.kt create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable/launch_background.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values-night/styles.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values/styles.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/app/src/profile/AndroidManifest.xml create mode 100644 packages/wyatt_authentication_bloc/example_router/android/build.gradle create mode 100644 packages/wyatt_authentication_bloc/example_router/android/gradle.properties create mode 100644 packages/wyatt_authentication_bloc/example_router/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/wyatt_authentication_bloc/example_router/android/settings.gradle create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/bootstrap.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/core/constants/form_field.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/core/routes/router.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/core/utils/app_bloc_observer.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/core/utils/forms.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/firebase_options.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/main.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/app/app.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/home/home_page.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/sign_in_page.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/sign_up_page.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sub/sub_page.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/lib/presentation/features/welcome/welcome_page.dart create mode 100644 packages/wyatt_authentication_bloc/example_router/test/widget_test.dart delete mode 100644 packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_cubit.dart rename packages/wyatt_authentication_bloc/lib/src/{models/user/user.dart => core/enum/auth_cubit_status.dart} (92%) rename packages/wyatt_authentication_bloc/lib/src/{models/exceptions/exceptions_interface.dart => core/exceptions/exceptions.dart} (100%) rename packages/wyatt_authentication_bloc/lib/src/{models => core}/exceptions/exceptions_firebase.dart (86%) rename packages/wyatt_authentication_bloc/lib/src/{repositories/repositories.dart => core/extensions/firebase_auth_user_x.dart} (76%) rename packages/wyatt_authentication_bloc/lib/src/{ => core}/utils/cryptography.dart (100%) rename packages/wyatt_authentication_bloc/lib/src/{models/user => data/models}/user_firebase.dart (94%) rename packages/wyatt_authentication_bloc/lib/src/{ => data}/repositories/authentication_repository_firebase.dart (87%) rename packages/wyatt_authentication_bloc/lib/src/{models/user/user_interface.dart => domain/entities/user.dart} (97%) rename packages/wyatt_authentication_bloc/lib/src/{repositories/authentication_repository_interface.dart => domain/repositories/authentication_repository.dart} (84%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/authentication/authentication.dart (100%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/authentication/builder/authentication_builder.dart (58%) create mode 100644 packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart rename packages/wyatt_authentication_bloc/lib/src/{ => features}/authentication/cubit/authentication_state.dart (77%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/email_verification/cubit/email_verification_cubit.dart (81%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/email_verification/cubit/email_verification_state.dart (96%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/email_verification/email_verification.dart (100%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/password_reset/cubit/password_reset_cubit.dart (68%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/password_reset/cubit/password_reset_state.dart (96%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/password_reset/password_reset.dart (100%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/sign_in/cubit/sign_in_cubit.dart (75%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/sign_in/cubit/sign_in_state.dart (84%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/sign_in/sign_in.dart (100%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/sign_up/cubit/sign_up_cubit.dart (64%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/sign_up/cubit/sign_up_state.dart (57%) rename packages/wyatt_authentication_bloc/lib/src/{ => features}/sign_up/sign_up.dart (100%) delete mode 100644 packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions.dart delete mode 100644 packages/wyatt_authentication_bloc/lib/src/models/models.dart diff --git a/packages/wyatt_authentication_bloc/example/lib/sign_up/widgets/sign_up_form.dart b/packages/wyatt_authentication_bloc/example/lib/sign_up/widgets/sign_up_form.dart index 36f2e231..8672edbe 100644 --- a/packages/wyatt_authentication_bloc/example/lib/sign_up/widgets/sign_up_form.dart +++ b/packages/wyatt_authentication_bloc/example/lib/sign_up/widgets/sign_up_form.dart @@ -149,7 +149,7 @@ class _PasswordInput extends StatelessWidget { .read() .state .data - .valueOf(formFieldConfirmedPassword), + .valueOf(formFieldConfirmedPassword), ), ); }, @@ -202,7 +202,7 @@ class _CheckIsProInput extends StatelessWidget { trailing: BlocBuilder( builder: (context, state) { return Checkbox( - value: state.data.valueOf(formFieldPro), + value: state.data.valueOf(formFieldPro), onChanged: (isPro) { final value = isPro!; // tristate is false, so value can't be null @@ -296,7 +296,7 @@ class SignUpForm extends StatelessWidget { const SizedBox(height: 8), BlocBuilder( builder: (context, state) { - if (state.data.valueOf(formFieldPro)) { + if (state.data.valueOf(formFieldPro)) { return Column(children: [ _SirenInput(), const SizedBox(height: 8), diff --git a/packages/wyatt_authentication_bloc/example_router/.gitignore b/packages/wyatt_authentication_bloc/example_router/.gitignore new file mode 100644 index 00000000..a8e938c0 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/.gitignore @@ -0,0 +1,47 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/packages/wyatt_authentication_bloc/example_router/.metadata b/packages/wyatt_authentication_bloc/example_router/.metadata new file mode 100644 index 00000000..2544bab1 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/.metadata @@ -0,0 +1,30 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled. + +version: + revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + channel: stable + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + - platform: android + create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/wyatt_authentication_bloc/example_router/.vscode/launch.json b/packages/wyatt_authentication_bloc/example_router/.vscode/launch.json new file mode 100644 index 00000000..61fa495d --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/.vscode/launch.json @@ -0,0 +1,25 @@ +/* + * Author: Hugo Pointcheval + * Email: git@pcl.ovh + * ----- + * File: launch.json + * Created Date: 19/08/2022 15:12:25 + * Last Modified: 19/08/2022 15:22:02 + * ----- + * Copyright (c) 2022 + */ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "example_router", + "request": "launch", + "type": "dart", + "program": "lib/main.dart", + "flutterMode": "debug" + } + ] +} \ No newline at end of file diff --git a/packages/wyatt_authentication_bloc/example_router/README.md b/packages/wyatt_authentication_bloc/example_router/README.md new file mode 100644 index 00000000..139e82ee --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/README.md @@ -0,0 +1,16 @@ +# example_router + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/packages/wyatt_authentication_bloc/example_router/analysis_options.yaml b/packages/wyatt_authentication_bloc/example_router/analysis_options.yaml new file mode 100644 index 00000000..61b6c4de --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/wyatt_authentication_bloc/example_router/android/.gitignore b/packages/wyatt_authentication_bloc/example_router/android/.gitignore new file mode 100644 index 00000000..6f568019 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/build.gradle b/packages/wyatt_authentication_bloc/example_router/android/app/build.gradle new file mode 100644 index 00000000..c0822b30 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/build.gradle @@ -0,0 +1,74 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +// START: FlutterFire Configuration +apply plugin: 'com.google.gms.google-services' +// END: FlutterFire Configuration +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.example_router" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. + minSdkVersion 21 + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/debug/AndroidManifest.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..4ee1d947 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/AndroidManifest.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..7c354a29 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/kotlin/com/example/example_router/MainActivity.kt b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/kotlin/com/example/example_router/MainActivity.kt new file mode 100644 index 00000000..a6e9ae0a --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/kotlin/com/example/example_router/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.example_router + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable/launch_background.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values-night/styles.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..06952be7 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values/styles.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..cb1ef880 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/app/src/profile/AndroidManifest.xml b/packages/wyatt_authentication_bloc/example_router/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 00000000..4ee1d947 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + diff --git a/packages/wyatt_authentication_bloc/example_router/android/build.gradle b/packages/wyatt_authentication_bloc/example_router/android/build.gradle new file mode 100644 index 00000000..9192654d --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/build.gradle @@ -0,0 +1,34 @@ +buildscript { + ext.kotlin_version = '1.6.10' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.1.2' + // START: FlutterFire Configuration + classpath 'com.google.gms:google-services:4.3.10' + // END: FlutterFire Configuration + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/packages/wyatt_authentication_bloc/example_router/android/gradle.properties b/packages/wyatt_authentication_bloc/example_router/android/gradle.properties new file mode 100644 index 00000000..94adc3a3 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/wyatt_authentication_bloc/example_router/android/gradle/wrapper/gradle-wrapper.properties b/packages/wyatt_authentication_bloc/example_router/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..cc5527d7 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/packages/wyatt_authentication_bloc/example_router/android/settings.gradle b/packages/wyatt_authentication_bloc/example_router/android/settings.gradle new file mode 100644 index 00000000..44e62bcf --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/packages/wyatt_authentication_bloc/example_router/lib/bootstrap.dart b/packages/wyatt_authentication_bloc/example_router/lib/bootstrap.dart new file mode 100644 index 00000000..cc0ab97e --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/bootstrap.dart @@ -0,0 +1,40 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: bootstrap.dart +// Created Date: 19/08/2022 15:05:17 +// Last Modified: 19/08/2022 15:21:47 +// ----- +// Copyright (c) 2022 + +import 'dart:async'; + +import 'package:example_router/core/utils/app_bloc_observer.dart'; +import 'package:example_router/firebase_options.dart'; +import 'package:firebase_core/firebase_core.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; + +Future bootstrap(FutureOr Function() builder) async { + await runZonedGuarded( + () async { + WidgetsFlutterBinding.ensureInitialized(); + + FlutterError.onError = (details) { + debugPrint(details.toString()); + }; + + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); + + GoRouter.setUrlPathStrategy(UrlPathStrategy.path); + + Bloc.observer = AppBlocObserver(); + + runApp(await builder()); + }, + (error, stackTrace) => debugPrint(error.toString()), + ); +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/core/constants/form_field.dart b/packages/wyatt_authentication_bloc/example_router/lib/core/constants/form_field.dart new file mode 100644 index 00000000..e371dfb6 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/core/constants/form_field.dart @@ -0,0 +1,12 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: form_field.dart +// Created Date: 19/08/2022 11:52:33 +// Last Modified: 19/08/2022 16:35:39 +// ----- +// Copyright (c) 2022 + +abstract class AppFormField { + static const confirmedPassword = 'confirmedPassword'; +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/core/routes/router.dart b/packages/wyatt_authentication_bloc/example_router/lib/core/routes/router.dart new file mode 100644 index 00000000..85545c34 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/core/routes/router.dart @@ -0,0 +1,79 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: router.dart +// Created Date: 19/08/2022 11:52:22 +// Last Modified: 19/08/2022 16:39:07 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/presentation/features/home/home_page.dart'; +import 'package:example_router/presentation/features/sign_in/sign_in_page.dart'; +import 'package:example_router/presentation/features/sign_up/sign_up_page.dart'; +import 'package:example_router/presentation/features/sub/sub_page.dart'; +import 'package:example_router/presentation/features/welcome/welcome_page.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:go_router/go_router.dart'; + +class AppRouter { + /// Default transition for all pages + static Page defaultTransition( + BuildContext context, + GoRouterState state, + Widget child, + ) => + CupertinoPage( + key: state.pageKey, + child: child, + ); + + static final publicRoutes = ['/', '/sign_in', '/sign_up']; + + static final List routes = [ + GoRoute( + path: '/', + name: WelcomePage.pageName, + pageBuilder: (context, state) => defaultTransition( + context, + state, + const WelcomePage(), + ), + ), + GoRoute( + path: '/sign_in', + name: SignInPage.pageName, + pageBuilder: (context, state) => defaultTransition( + context, + state, + const SignInPage(), + ), + ), + GoRoute( + path: '/sign_up', + name: SignUpPage.pageName, + pageBuilder: (context, state) => defaultTransition( + context, + state, + const SignUpPage(), + ), + ), + GoRoute( + path: '/home', + name: HomePage.pageName, + pageBuilder: (context, state) => defaultTransition( + context, + state, + const HomePage(), + ), + ), + GoRoute( + path: '/home/sub', + name: SubPage.pageName, + pageBuilder: (context, state) => defaultTransition( + context, + state, + const SubPage(), + ), + ), + ]; +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/core/utils/app_bloc_observer.dart b/packages/wyatt_authentication_bloc/example_router/lib/core/utils/app_bloc_observer.dart new file mode 100644 index 00000000..1b44c4e8 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/core/utils/app_bloc_observer.dart @@ -0,0 +1,37 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: app_bloc_observer.dart +// Created Date: 19/08/2022 12:02:23 +// Last Modified: 19/08/2022 12:02:45 +// ----- +// Copyright (c) 2022 + +import 'package:flutter/foundation.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class AppBlocObserver extends BlocObserver { + @override + void onEvent(Bloc bloc, Object? event) { + super.onEvent(bloc, event); + debugPrint(event.toString()); + } + + @override + void onError(BlocBase bloc, Object error, StackTrace stackTrace) { + debugPrint(error.toString()); + super.onError(bloc, error, stackTrace); + } + + @override + void onChange(BlocBase bloc, Change change) { + super.onChange(bloc, change); + debugPrint('curr:\t${change.currentState}\nnext:\t${change.nextState}'); + } + + @override + void onTransition(Bloc bloc, Transition transition) { + super.onTransition(bloc, transition); + debugPrint(transition.toString()); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/core/utils/forms.dart b/packages/wyatt_authentication_bloc/example_router/lib/core/utils/forms.dart new file mode 100644 index 00000000..ead7fb45 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/core/utils/forms.dart @@ -0,0 +1,21 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: forms.dart +// Created Date: 19/08/2022 12:00:31 +// Last Modified: 19/08/2022 16:35:52 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/core/constants/form_field.dart'; +import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; + +class Forms { + static FormData getNormalData() => const FormData([ + FormInput( + AppFormField.confirmedPassword, + ConfirmedPassword.pure(), + metadata: FormInputMetadata(export: false), + ), + ]); +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/firebase_options.dart b/packages/wyatt_authentication_bloc/example_router/lib/firebase_options.dart new file mode 100644 index 00000000..20a9ebf6 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/firebase_options.dart @@ -0,0 +1,63 @@ +// File generated by FlutterFire CLI. +// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members +import 'package:firebase_core/firebase_core.dart' show FirebaseOptions; +import 'package:flutter/foundation.dart' + show defaultTargetPlatform, kIsWeb, TargetPlatform; + +/// Default [FirebaseOptions] for use with your Firebase apps. +/// +/// Example: +/// ```dart +/// import 'firebase_options.dart'; +/// // ... +/// await Firebase.initializeApp( +/// options: DefaultFirebaseOptions.currentPlatform, +/// ); +/// ``` +class DefaultFirebaseOptions { + static FirebaseOptions get currentPlatform { + if (kIsWeb) { + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for web - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + } + switch (defaultTargetPlatform) { + case TargetPlatform.android: + return android; + case TargetPlatform.iOS: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for ios - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + case TargetPlatform.macOS: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for macos - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + case TargetPlatform.windows: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for windows - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + case TargetPlatform.linux: + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for linux - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); + default: + throw UnsupportedError( + 'DefaultFirebaseOptions are not supported for this platform.', + ); + } + } + + static const FirebaseOptions android = FirebaseOptions( + apiKey: 'AIzaSyAYS14uXupkS158Q5QAFP1864UrUN_yDSk', + appId: '1:136771801992:android:ac3cfeb99fb0763e97203d', + messagingSenderId: '136771801992', + projectId: 'tchat-beta', + databaseURL: 'https://tchat-beta.firebaseio.com', + storageBucket: 'tchat-beta.appspot.com', + ); +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/main.dart b/packages/wyatt_authentication_bloc/example_router/lib/main.dart new file mode 100644 index 00000000..06b15c7c --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/main.dart @@ -0,0 +1,6 @@ +import 'package:example_router/bootstrap.dart'; +import 'package:example_router/presentation/features/app/app.dart'; + +void main() { + bootstrap(App.new); +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/app/app.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/app/app.dart new file mode 100644 index 00000000..291387e7 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/app/app.dart @@ -0,0 +1,115 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: app.dart +// Created Date: 19/08/2022 12:05:38 +// Last Modified: Fri Aug 26 2022 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/core/routes/router.dart'; +import 'package:example_router/core/utils/forms.dart'; +import 'package:example_router/presentation/features/home/home_page.dart'; +import 'package:example_router/presentation/features/welcome/welcome_page.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; + +class App extends StatelessWidget { + final AuthenticationRepository authenticationRepository = + AuthenticationRepositoryFirebase(); + + App({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + AuthenticationState? previous; + + final AuthenticationCubit authenticationCubit = AuthenticationCubit( + authenticationRepository: authenticationRepository, + onAuthSuccess: (user) async { + debugPrint(user.toString()); + return {}; + }, + ); + + final GoRouter router = GoRouter( + initialLocation: '/', + routes: AppRouter.routes, + debugLogDiagnostics: true, + errorBuilder: (_, __) => const ColoredBox( + color: Colors.red, + ), + refreshListenable: GoRouterRefreshStream(authenticationCubit.stream), + redirect: (state) { + final authState = authenticationCubit.state; + + if (authState != previous) { + previous = authState; + // Check if current user is logged in + final loggedIn = + authState.status == AuthenticationStatus.authenticated; + + // Checking if current path is onboarding or not + final isOnboarding = AppRouter.publicRoutes.contains(state.subloc); + + if (!loggedIn) { + debugPrint('Not logged'); + if (isOnboarding) { + return null; + } else { + return state.namedLocation(WelcomePage.pageName); + } + } else { + final email = authState.user?.email; + debugPrint('Logged as: $email'); + if (isOnboarding) { + return state.namedLocation(HomePage.pageName); + } else { + return null; + } + } + } + return null; + }, + ); + + return MultiRepositoryProvider( + providers: [ + RepositoryProvider.value( + value: authenticationRepository, + ), + ], + child: MultiBlocProvider( + providers: [ + BlocProvider.value( + value: authenticationCubit..init(), + ), + BlocProvider( + create: (_) => SignUpCubit( + authenticationRepository: authenticationRepository, + formData: Forms.getNormalData(), + onSignUpSuccess: (state, uid) async { + debugPrint(state.toString()); + debugPrint(uid); + }, + ), + ), + BlocProvider( + create: (_) => SignInCubit( + authenticationRepository: authenticationRepository, + ), + ), + ], + child: MaterialApp.router( + title: 'Demo Authentication', + debugShowCheckedModeBanner: false, + routerDelegate: router.routerDelegate, + routeInformationParser: router.routeInformationParser, + routeInformationProvider: router.routeInformationProvider, + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/home/home_page.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/home/home_page.dart new file mode 100644 index 00000000..316598cb --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/home/home_page.dart @@ -0,0 +1,55 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: home_page.dart +// Created Date: 19/08/2022 14:38:24 +// Last Modified: 19/08/2022 16:12:22 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/presentation/features/sub/sub_page.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; + +class HomePage extends StatelessWidget { + const HomePage({Key? key}) : super(key: key); + + static String pageName = 'Home'; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Home'), + actions: [ + IconButton( + onPressed: () => context.read().logOut(), + icon: const Icon(Icons.logout_rounded)) + ], + ), + body: Padding( + padding: const EdgeInsets.all(8), + child: SingleChildScrollView( + child: Column( + children: [ + BlocBuilder( + builder: (context, state) { + final email = state.user?.email; + return Text('Logged as $email'); + }, + ), + const SizedBox( + height: 8, + ), + ElevatedButton( + onPressed: () => context.pushNamed(SubPage.pageName), + child: const Text('Go to sub page')), + ], + ), + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/sign_in_page.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/sign_in_page.dart new file mode 100644 index 00000000..39fd0463 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/sign_in_page.dart @@ -0,0 +1,30 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: sign_in_page.dart +// Created Date: 19/08/2022 12:41:42 +// Last Modified: 19/08/2022 15:26:36 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/presentation/features/sign_in/widgets/sign_in_form.dart'; +import 'package:flutter/material.dart'; + +class SignInPage extends StatelessWidget { + const SignInPage({Key? key}) : super(key: key); + + static String pageName = 'SignIn'; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar(title: const Text('Sign In')), + body: const Padding( + padding: EdgeInsets.all(8), + child: SingleChildScrollView( + child: SignInForm(), + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart new file mode 100644 index 00000000..ea785177 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart @@ -0,0 +1,105 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: sign_in_form.dart +// Created Date: 19/08/2022 15:24:37 +// Last Modified: 19/08/2022 16:35:01 +// ----- +// Copyright (c) 2022 + +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; + +class _EmailInput extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + buildWhen: (previous, current) => previous.email != current.email, + builder: (context, state) { + return TextField( + onChanged: (email) => context.read().emailChanged(email), + keyboardType: TextInputType.emailAddress, + decoration: InputDecoration( + labelText: 'Email', + helperText: '', + errorText: state.email.invalid ? 'Invalid email' : null, + ), + ); + }, + ); + } +} + +class _PasswordInput extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + buildWhen: (previous, current) => previous.password != current.password, + builder: (context, state) { + return TextField( + onChanged: (password) { + context.read().passwordChanged(password); + }, + obscureText: true, + decoration: InputDecoration( + labelText: 'Password', + helperText: '', + errorText: state.password.invalid ? 'Invalid password' : null, + ), + ); + }, + ); + } +} + +class _SignInButton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return state.status.isSubmissionInProgress + ? const CircularProgressIndicator() + : ElevatedButton( + onPressed: state.status.isValidated + ? () => + context.read().signInWithEmailAndPassword() + : null, + child: const Text('Sign in'), + ); + }, + ); + } +} + +class SignInForm extends StatelessWidget { + const SignInForm({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return BlocListener( + listener: (context, state) { + if (state.status.isSubmissionSuccess) { + Navigator.of(context).pop(); + } else if (state.status.isSubmissionFailure) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar(content: Text(state.errorMessage ?? 'Sign In Failure')), + ); + } + }, + child: SingleChildScrollView( + child: Column( + children: [ + _EmailInput(), + const SizedBox(height: 8), + _PasswordInput(), + const SizedBox(height: 16), + _SignInButton(), + ], + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/sign_up_page.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/sign_up_page.dart new file mode 100644 index 00000000..31f18bb6 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/sign_up_page.dart @@ -0,0 +1,30 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: sign_up_page.dart +// Created Date: 19/08/2022 12:41:27 +// Last Modified: 19/08/2022 14:58:51 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/presentation/features/sign_up/widgets/sign_up_form.dart'; +import 'package:flutter/material.dart'; + +class SignUpPage extends StatelessWidget { + const SignUpPage({Key? key}) : super(key: key); + + static String pageName = 'SignUp'; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar(title: const Text('Sign Up')), + body: const Padding( + padding: EdgeInsets.all(8), + child: SingleChildScrollView( + child: SignUpForm(), + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart new file mode 100644 index 00000000..4a7faf42 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart @@ -0,0 +1,149 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: sign_up_form.dart +// Created Date: 19/08/2022 14:41:08 +// Last Modified: Fri Aug 26 2022 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/core/constants/form_field.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; +import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; + +class _EmailInput extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + buildWhen: (previous, current) => previous.email != current.email, + builder: (context, state) { + return TextField( + onChanged: (email) => context.read().emailChanged(email), + keyboardType: TextInputType.emailAddress, + decoration: InputDecoration( + labelText: 'Email', + helperText: '', + errorText: state.email.invalid ? 'Invalid email' : null, + ), + ); + }, + ); + } +} + +class _PasswordInput extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + buildWhen: (previous, current) => previous.password != current.password, + builder: (context, state) { + return TextField( + onChanged: (password) { + context.read().passwordChanged(password); + context.read().dataChanged( + AppFormField.confirmedPassword, + ConfirmedPassword.dirty( + password: password, + value: context + .read() + .state + .data + .valueOf( + AppFormField.confirmedPassword), + ), + ); + }, + obscureText: true, + decoration: InputDecoration( + labelText: 'Password', + helperText: '', + errorText: state.password.invalid ? 'Invalid password' : null, + ), + ); + }, + ); + } +} + +class _ConfirmPasswordInput extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return TextField( + onChanged: (confirmPassword) => context + .read() + .dataChanged( + AppFormField.confirmedPassword, + ConfirmedPassword.dirty( + password: context.read().state.password.value, + value: confirmPassword, + ), + ), + obscureText: true, + decoration: InputDecoration( + labelText: 'Confirm password', + helperText: '', + errorText: state.data.isNotValid(AppFormField.confirmedPassword) + ? 'Passwords do not match' + : null, + ), + ); + }, + ); + } +} + +class _SignUpButton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return state.status.isSubmissionInProgress + ? const CircularProgressIndicator() + : ElevatedButton( + onPressed: state.status.isValidated + ? () => context.read().signUpFormSubmitted() + : null, + child: const Text('Sign up'), + ); + }, + ); + } +} + +class SignUpForm extends StatelessWidget { + const SignUpForm({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return BlocListener( + listener: (context, state) { + if (state.status.isSubmissionSuccess) { + Navigator.of(context).pop(); + } else if (state.status.isSubmissionFailure) { + ScaffoldMessenger.of(context) + ..hideCurrentSnackBar() + ..showSnackBar( + SnackBar(content: Text(state.errorMessage ?? 'Sign Up Failure')), + ); + } + }, + child: SingleChildScrollView( + child: Column( + children: [ + _EmailInput(), + const SizedBox(height: 8), + _PasswordInput(), + const SizedBox(height: 8), + _ConfirmPasswordInput(), + const SizedBox(height: 16), + _SignUpButton(), + ], + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sub/sub_page.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sub/sub_page.dart new file mode 100644 index 00000000..34f4558f --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sub/sub_page.dart @@ -0,0 +1,38 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: sub_page.dart +// Created Date: 19/08/2022 16:10:05 +// Last Modified: 19/08/2022 16:10:44 +// ----- +// Copyright (c) 2022 + +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; + +class SubPage extends StatelessWidget { + const SubPage({Key? key}) : super(key: key); + + static String pageName = 'Sub'; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Sub'), + actions: [ + IconButton( + onPressed: () => context.read().logOut(), + icon: const Icon(Icons.logout_rounded)) + ], + ), + body: const Padding( + padding: EdgeInsets.all(8), + child: SingleChildScrollView( + child: Text('Another page'), + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/welcome/welcome_page.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/welcome/welcome_page.dart new file mode 100644 index 00000000..aa3a10c4 --- /dev/null +++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/welcome/welcome_page.dart @@ -0,0 +1,53 @@ +// Author: Hugo Pointcheval +// Email: git@pcl.ovh +// ----- +// File: welcome_page.dart +// Created Date: 19/08/2022 12:33:21 +// Last Modified: 19/08/2022 15:56:05 +// ----- +// Copyright (c) 2022 + +import 'package:example_router/presentation/features/sign_in/sign_in_page.dart'; +import 'package:example_router/presentation/features/sign_up/sign_up_page.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; + +class WelcomePage extends StatelessWidget { + const WelcomePage({Key? key}) : super(key: key); + + static String pageName = 'Welcome'; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Welcome'), + actions: [ + IconButton( + onPressed: () => context.read().changeStatus( + context.read().state.user!), + icon: const Icon(Icons.refresh_rounded)) + ], + ), + body: SingleChildScrollView( + child: Column( + children: [ + ElevatedButton( + onPressed: () => context.pushNamed(SignUpPage.pageName), + child: const Text('Sign Up')), + ElevatedButton( + onPressed: () => context.pushNamed(SignInPage.pageName), + style: ButtonStyle( + backgroundColor: + MaterialStateProperty.all(Colors.white), + foregroundColor: + MaterialStateProperty.all(Colors.blue)), + child: const Text('Sign In')) + ], + ), + ), + ); + } +} diff --git a/packages/wyatt_authentication_bloc/example_router/test/widget_test.dart b/packages/wyatt_authentication_bloc/example_router/test/widget_test.dart new file mode 100644 index 00000000..e69de29b diff --git a/packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_cubit.dart deleted file mode 100644 index 018eb566..00000000 --- a/packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_cubit.dart +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (C) 2022 WYATT GROUP -// Please see the AUTHORS file for details. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -import 'dart:async'; - -import 'package:bloc/bloc.dart'; -import 'package:equatable/equatable.dart'; -import 'package:wyatt_authentication_bloc/src/models/user/user_interface.dart'; -import 'package:wyatt_authentication_bloc/src/repositories/authentication_repository_interface.dart'; - -part 'authentication_state.dart'; - -class AuthenticationCubit extends Cubit { - final AuthenticationRepositoryInterface _authenticationRepository; - - StreamSubscription? _userSubscription; - - final Future> Function(UserInterface user)? - _onAuthSuccess; - - AuthenticationCubit({ - required AuthenticationRepositoryInterface authenticationRepository, - Future> Function(UserInterface user)? onAuthSuccess, - }) : _authenticationRepository = authenticationRepository, - _onAuthSuccess = onAuthSuccess, - super(const AuthenticationState.unknown()); - - Future init() async { - final _firstUser = await _authenticationRepository.user.first; - start(); - return changeStatus(_firstUser); - } - - bool start() { - _userSubscription = _authenticationRepository.user.listen(changeStatus); - return true; - } - - bool stop() { - _userSubscription?.cancel(); - return true; - } - - Future changeStatus(UserInterface user) async { - if (user.isNotEmpty) { - final Map? userData = await _onAuthSuccess?.call(user); - emit(AuthenticationState.authenticated(user, userData)); - } else { - stop(); - emit(const AuthenticationState.unauthenticated()); - } - } - - void logOut() { - unawaited(_authenticationRepository.signOut()); - } - - @override - Future close() { - _userSubscription?.cancel(); - return super.close(); - } -} diff --git a/packages/wyatt_authentication_bloc/lib/src/models/user/user.dart b/packages/wyatt_authentication_bloc/lib/src/core/enum/auth_cubit_status.dart similarity index 92% rename from packages/wyatt_authentication_bloc/lib/src/models/user/user.dart rename to packages/wyatt_authentication_bloc/lib/src/core/enum/auth_cubit_status.dart index 2a470388..37448fa1 100644 --- a/packages/wyatt_authentication_bloc/lib/src/models/user/user.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/enum/auth_cubit_status.dart @@ -14,5 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -export 'user_firebase.dart'; -export 'user_interface.dart'; +enum AuthCubitStatus { + started, + stoped, +} diff --git a/packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions_interface.dart b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions_interface.dart rename to packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions_firebase.dart b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart similarity index 86% rename from packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions_firebase.dart rename to packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart index eade1e10..83c911a1 100644 --- a/packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions_firebase.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_interface.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions.dart'; class ApplyActionCodeFailureFirebase extends ApplyActionCodeFailureInterface { ApplyActionCodeFailureFirebase([String? code, String? message]) @@ -148,32 +148,28 @@ class SignInWithCredentialFailureFirebase class SignInWithGoogleFailureFirebase extends SignInWithCredentialFailureFirebase implements SignInWithGoogleFailureInterface { - SignInWithGoogleFailureFirebase([String? code, String? message]) - : super(code, message); - SignInWithGoogleFailureFirebase.fromCode(String code) : super.fromCode(code); + SignInWithGoogleFailureFirebase([super.code, super.message]); + SignInWithGoogleFailureFirebase.fromCode(super.code) : super.fromCode(); } class SignInWithFacebookFailureFirebase extends SignInWithCredentialFailureFirebase implements SignInWithFacebookFailureInterface { - SignInWithFacebookFailureFirebase([String? code, String? message]) - : super(code, message); - SignInWithFacebookFailureFirebase.fromCode(String code) - : super.fromCode(code); + SignInWithFacebookFailureFirebase([super.code, super.message]); + SignInWithFacebookFailureFirebase.fromCode(super.code) + : super.fromCode(); } class SignInWithAppleFailureFirebase extends SignInWithCredentialFailureFirebase implements SignInWithAppleFailureInterface { - SignInWithAppleFailureFirebase([String? code, String? message]) - : super(code, message); - SignInWithAppleFailureFirebase.fromCode(String code) : super.fromCode(code); + SignInWithAppleFailureFirebase([super.code, super.message]); + SignInWithAppleFailureFirebase.fromCode(super.code) : super.fromCode(); } class SignInWithTwitterFailureFirebase extends SignInWithCredentialFailureFirebase implements SignInWithAppleFailureInterface { - SignInWithTwitterFailureFirebase([String? code, String? message]) - : super(code, message); - SignInWithTwitterFailureFirebase.fromCode(String code) : super.fromCode(code); + SignInWithTwitterFailureFirebase([super.code, super.message]); + SignInWithTwitterFailureFirebase.fromCode(super.code) : super.fromCode(); } @@ -233,16 +229,16 @@ class SendEmailVerificationFailureFirebase SendEmailVerificationFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SendEmailVerificationFailureFirebase.fromCode(String code) - : super.fromCode(code); + SendEmailVerificationFailureFirebase.fromCode(super.code) + : super.fromCode(); } class SendPasswordResetEmailFailureFirebase extends SendPasswordResetEmailFailureInterface { SendPasswordResetEmailFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SendPasswordResetEmailFailureFirebase.fromCode(String code) - : super.fromCode(code); + SendPasswordResetEmailFailureFirebase.fromCode(super.code) + : super.fromCode(); } class SendSignInLinkEmailFailureFirebase @@ -250,8 +246,8 @@ class SendSignInLinkEmailFailureFirebase SendSignInLinkEmailFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SendSignInLinkEmailFailureFirebase.fromCode(String code) - : super.fromCode(code); + SendSignInLinkEmailFailureFirebase.fromCode(super.code) + : super.fromCode(); } class ConfirmPasswordResetFailureFirebase @@ -259,8 +255,8 @@ class ConfirmPasswordResetFailureFirebase ConfirmPasswordResetFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - ConfirmPasswordResetFailureFirebase.fromCode(String code) - : super.fromCode(code); + ConfirmPasswordResetFailureFirebase.fromCode(super.code) + : super.fromCode(); } class VerifyPasswordResetCodeFailureFirebase @@ -268,19 +264,19 @@ class VerifyPasswordResetCodeFailureFirebase VerifyPasswordResetCodeFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - VerifyPasswordResetCodeFailureFirebase.fromCode(String code) - : super.fromCode(code); + VerifyPasswordResetCodeFailureFirebase.fromCode(super.code) + : super.fromCode(); } class RefreshFailureFirebase extends RefreshFailureInterface { RefreshFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - RefreshFailureFirebase.fromCode(String code) : super.fromCode(code); + RefreshFailureFirebase.fromCode(super.code) : super.fromCode(); } class SignOutFailureFirebase extends SignOutFailureInterface { SignOutFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SignOutFailureFirebase.fromCode(String code) : super.fromCode(code); + SignOutFailureFirebase.fromCode(super.code) : super.fromCode(); } diff --git a/packages/wyatt_authentication_bloc/lib/src/repositories/repositories.dart b/packages/wyatt_authentication_bloc/lib/src/core/extensions/firebase_auth_user_x.dart similarity index 76% rename from packages/wyatt_authentication_bloc/lib/src/repositories/repositories.dart rename to packages/wyatt_authentication_bloc/lib/src/core/extensions/firebase_auth_user_x.dart index 2f4f5294..70b870c3 100644 --- a/packages/wyatt_authentication_bloc/lib/src/repositories/repositories.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/extensions/firebase_auth_user_x.dart @@ -14,5 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -export 'authentication_repository_firebase.dart'; -export 'authentication_repository_interface.dart'; +import 'package:firebase_auth/firebase_auth.dart'; +import 'package:wyatt_authentication_bloc/src/data/models/user_firebase.dart'; + +extension FirebaseAuthUserX on User { + UserFirebase get model => UserFirebase(this); +} diff --git a/packages/wyatt_authentication_bloc/lib/src/utils/cryptography.dart b/packages/wyatt_authentication_bloc/lib/src/core/utils/cryptography.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/utils/cryptography.dart rename to packages/wyatt_authentication_bloc/lib/src/core/utils/cryptography.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/models/user/user_firebase.dart b/packages/wyatt_authentication_bloc/lib/src/data/models/user_firebase.dart similarity index 94% rename from packages/wyatt_authentication_bloc/lib/src/models/user/user_firebase.dart rename to packages/wyatt_authentication_bloc/lib/src/data/models/user_firebase.dart index 53908ab2..31139cf3 100644 --- a/packages/wyatt_authentication_bloc/lib/src/models/user/user_firebase.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/models/user_firebase.dart @@ -1,24 +1,23 @@ // Copyright (C) 2022 WYATT GROUP // Please see the AUTHORS file for details. -// +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program. If not, see . import 'package:firebase_auth/firebase_auth.dart'; +import 'package:wyatt_authentication_bloc/src/domain/entities/user.dart' as wyatt; -import 'package:wyatt_authentication_bloc/src/models/user/user_interface.dart'; - -class UserFirebase implements UserInterface { +class UserFirebase implements wyatt.User { final User? _user; const UserFirebase(User user) : _user = user; diff --git a/packages/wyatt_authentication_bloc/lib/src/repositories/authentication_repository_firebase.dart b/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_firebase.dart similarity index 87% rename from packages/wyatt_authentication_bloc/lib/src/repositories/authentication_repository_firebase.dart rename to packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_firebase.dart index f2838122..0cf6d5dc 100644 --- a/packages/wyatt_authentication_bloc/lib/src/repositories/authentication_repository_firebase.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_firebase.dart @@ -14,19 +14,24 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +import 'dart:async'; + import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart'; import 'package:twitter_login/twitter_login.dart'; -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_firebase.dart'; -import 'package:wyatt_authentication_bloc/src/models/user/user_firebase.dart'; -import 'package:wyatt_authentication_bloc/src/models/user/user_interface.dart'; -import 'package:wyatt_authentication_bloc/src/repositories/authentication_repository_interface.dart'; -import 'package:wyatt_authentication_bloc/src/utils/cryptography.dart'; +import 'package:wyatt_authentication_bloc/src/core/enum/auth_cubit_status.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions_firebase.dart'; +import 'package:wyatt_authentication_bloc/src/core/extensions/firebase_auth_user_x.dart'; +import 'package:wyatt_authentication_bloc/src/core/utils/cryptography.dart'; +import 'package:wyatt_authentication_bloc/src/data/models/user_firebase.dart'; +import 'package:wyatt_authentication_bloc/src/domain/entities/user.dart' + as wyatt; +import 'package:wyatt_authentication_bloc/src/domain/repositories/authentication_repository.dart'; -class AuthenticationRepositoryFirebase - implements AuthenticationRepositoryInterface { +class AuthenticationRepositoryFirebase implements AuthenticationRepository { + final _controller = StreamController(); final FirebaseAuth _firebaseAuth; final TwitterLogin? _twitterLogin; @@ -36,23 +41,30 @@ class AuthenticationRepositoryFirebase FirebaseAuth? firebaseAuth, TwitterLogin? twitterLogin, }) : _firebaseAuth = firebaseAuth ?? FirebaseAuth.instance, - _twitterLogin = twitterLogin; - - @override - Stream get user { - return _firebaseAuth.userChanges().map((User? firebaseUser) { - final UserFirebase user = firebaseUser == null - ? const UserFirebase.empty() - : firebaseUser.model; - _userCache = user; - return user; - }); + _twitterLogin = twitterLogin { + _controller.sink.add(AuthCubitStatus.stoped); } @override - UserInterface get currentUser { - return _userCache; - } + Stream get cubitStatus => + _controller.stream.asBroadcastStream(); + + @override + void changeCubitStatus(AuthCubitStatus status) => + _controller.sink.add(status); + + @override + Stream get user => + _firebaseAuth.userChanges().map((firebaseUser) { + final UserFirebase user = (firebaseUser == null) + ? const UserFirebase.empty() + : firebaseUser.model; + _userCache = user; + return user; + }); + + @override + wyatt.User get currentUser => _userCache; @override Future applyActionCode(String code) async { @@ -324,9 +336,3 @@ class AuthenticationRepositoryFirebase } } } - -extension on User { - UserFirebase get model { - return UserFirebase(this); - } -} diff --git a/packages/wyatt_authentication_bloc/lib/src/models/user/user_interface.dart b/packages/wyatt_authentication_bloc/lib/src/domain/entities/user.dart similarity index 97% rename from packages/wyatt_authentication_bloc/lib/src/models/user/user_interface.dart rename to packages/wyatt_authentication_bloc/lib/src/domain/entities/user.dart index 43b926bf..40c0c7b9 100644 --- a/packages/wyatt_authentication_bloc/lib/src/models/user/user_interface.dart +++ b/packages/wyatt_authentication_bloc/lib/src/domain/entities/user.dart @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -abstract class UserInterface { +abstract class User { /// The empty user constructor. - const UserInterface.empty(); + const User.empty(); /// The users display name. /// diff --git a/packages/wyatt_authentication_bloc/lib/src/repositories/authentication_repository_interface.dart b/packages/wyatt_authentication_bloc/lib/src/domain/repositories/authentication_repository.dart similarity index 84% rename from packages/wyatt_authentication_bloc/lib/src/repositories/authentication_repository_interface.dart rename to packages/wyatt_authentication_bloc/lib/src/domain/repositories/authentication_repository.dart index 4a2dc295..35c80a72 100644 --- a/packages/wyatt_authentication_bloc/lib/src/repositories/authentication_repository_interface.dart +++ b/packages/wyatt_authentication_bloc/lib/src/domain/repositories/authentication_repository.dart @@ -14,22 +14,29 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_interface.dart'; -import 'package:wyatt_authentication_bloc/src/models/user/user_interface.dart'; +import 'package:wyatt_authentication_bloc/src/core/enum/auth_cubit_status.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions.dart'; +import 'package:wyatt_authentication_bloc/src/domain/entities/user.dart'; /// {@template authentication_repository} /// Repository which manages user authentication. /// {@endtemplate} -abstract class AuthenticationRepositoryInterface { - /// Stream of [UserInterface] which will emit the current user when +abstract class AuthenticationRepository { + /// Stream of [AuthCubitStatus] wich will emit the current cubit status. + Stream get cubitStatus; + + /// Changes cubit status.(Useful to start or stop the engine.) + void changeCubitStatus(AuthCubitStatus status); + + /// Stream of [User] which will emit the current user when /// the authentication state changes. /// - /// Emits [UserInterface.empty] if the user is not authenticated. - Stream get user; + /// Emits [User.empty] if the user is not authenticated. + Stream get user; /// Returns the current cached account. - /// Defaults to [UserInterface.empty] if there is no cached user. - UserInterface get currentUser; + /// Defaults to [User.empty] if there is no cached user. + User get currentUser; /// Applies action code /// @@ -122,7 +129,7 @@ abstract class AuthenticationRepositoryInterface { Future verifyPasswordResetCode({required String code}); /// Signs out the current user which will emit - /// [UserInterface.empty] from the [user] Stream. + /// [User.empty] from the [user] Stream. Future signOut(); /// Refreshes the current user. diff --git a/packages/wyatt_authentication_bloc/lib/src/authentication/authentication.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/authentication.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/authentication/authentication.dart rename to packages/wyatt_authentication_bloc/lib/src/features/authentication/authentication.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/authentication/builder/authentication_builder.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/builder/authentication_builder.dart similarity index 58% rename from packages/wyatt_authentication_bloc/lib/src/authentication/builder/authentication_builder.dart rename to packages/wyatt_authentication_bloc/lib/src/features/authentication/builder/authentication_builder.dart index a0dc8079..f10c88c3 100644 --- a/packages/wyatt_authentication_bloc/lib/src/authentication/builder/authentication_builder.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/authentication/builder/authentication_builder.dart @@ -16,41 +16,40 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:wyatt_authentication_bloc/src/authentication/cubit/authentication_cubit.dart'; -import 'package:wyatt_authentication_bloc/src/models/user/user_interface.dart'; +import 'package:wyatt_authentication_bloc/src/domain/entities/user.dart'; +import 'package:wyatt_authentication_bloc/src/features/authentication/cubit/authentication_cubit.dart'; -class AuthenticationBuilder extends StatelessWidget { +class AuthenticationBuilder extends StatelessWidget { const AuthenticationBuilder({ - Key? key, required this.authenticated, required this.unauthenticated, required this.unknown, - }) : super(key: key); + super.key, + }); final Widget Function( BuildContext context, - UserInterface user, - Map? userData, + User user, + Extra? extra, ) authenticated; final Widget Function(BuildContext context) unauthenticated; final Widget Function(BuildContext context) unknown; @override - Widget build(BuildContext context) { - return BlocBuilder( - builder: (context, state) { - if (state.status == AuthenticationStatus.authenticated) { - if (state.user != null) { - return authenticated(context, state.user!, state.userData); - } else { + Widget build(BuildContext context) => + BlocBuilder, AuthenticationState>( + builder: (context, state) { + if (state.status == AuthenticationStatus.authenticated) { + if (state.user != null) { + return authenticated(context, state.user!, state.extra); + } else { + return unauthenticated(context); + } + } else if (state.status == AuthenticationStatus.unauthenticated) { return unauthenticated(context); + } else { + return unknown(context); } - } else if (state.status == AuthenticationStatus.unauthenticated) { - return unauthenticated(context); - } else { - return unknown(context); - } - }, - ); - } + }, + ); } diff --git a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart new file mode 100644 index 00000000..f773ab48 --- /dev/null +++ b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart @@ -0,0 +1,98 @@ +// Copyright (C) 2022 WYATT GROUP +// Please see the AUTHORS file for details. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +import 'dart:async'; + +import 'package:equatable/equatable.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/src/core/enum/auth_cubit_status.dart'; +import 'package:wyatt_authentication_bloc/src/domain/entities/user.dart'; +import 'package:wyatt_authentication_bloc/src/domain/repositories/authentication_repository.dart'; + +part 'authentication_state.dart'; + +class AuthenticationCubit extends Cubit> { + final AuthenticationRepository _authenticationRepository; + late final StreamSubscription _statusSubscription; + + StreamSubscription? _userSubscription; + + final Future Function(User user)? _onAuthSuccess; + + AuthenticationCubit({ + required AuthenticationRepository authenticationRepository, + Future Function(User user)? onAuthSuccess, + }) : _authenticationRepository = authenticationRepository, + _onAuthSuccess = onAuthSuccess, + super(const AuthenticationState.unknown()) { + _subscribeStatus(); + } + + Future get status async => + _authenticationRepository.cubitStatus.last; + + void _subscribeStatus() { + _statusSubscription = _authenticationRepository.cubitStatus.listen( + (status) { + switch (status) { + case AuthCubitStatus.started: + start(); + break; + case AuthCubitStatus.stoped: + stop(); + break; + } + }, + ); + } + + Future init() async { + final firstUser = await _authenticationRepository.user.first; + _authenticationRepository.changeCubitStatus(AuthCubitStatus.started); + return changeStatus(firstUser); + } + + bool start() { + _userSubscription = _authenticationRepository.user.listen(changeStatus); + return true; + } + + bool stop() { + _userSubscription?.cancel(); + return true; + } + + Future changeStatus(User user) async { + if (user.isNotEmpty) { + final Extra? extra = await _onAuthSuccess?.call(user); + emit(AuthenticationState.authenticated(user, extra)); + } else { + _authenticationRepository.changeCubitStatus(AuthCubitStatus.stoped); + emit(const AuthenticationState.unauthenticated()); + } + } + + void logOut() { + unawaited(_authenticationRepository.signOut()); + } + + @override + Future close() { + _userSubscription?.cancel(); + _statusSubscription.cancel(); + return super.close(); + } +} diff --git a/packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart similarity index 77% rename from packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_state.dart rename to packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart index 4e2de515..d01fdfb7 100644 --- a/packages/wyatt_authentication_bloc/lib/src/authentication/cubit/authentication_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart @@ -22,37 +22,36 @@ enum AuthenticationStatus { unauthenticated, } -class AuthenticationState extends Equatable { +class AuthenticationState extends Equatable { final AuthenticationStatus status; - final UserInterface? user; - final Map? userData; + final User? user; + final Extra? extra; const AuthenticationState._({ required this.status, this.user, - this.userData, + this.extra, }); const AuthenticationState.unknown() : this._(status: AuthenticationStatus.unknown); const AuthenticationState.authenticated( - UserInterface user, - Map? userData, + User user, + Extra? extra, ) : this._( status: AuthenticationStatus.authenticated, user: user, - userData: userData, + extra: extra, ); const AuthenticationState.unauthenticated() : this._(status: AuthenticationStatus.unauthenticated); @override - List get props => [status, user, userData]; + List get props => [status, user, extra]; @override - // ignore: lines_longer_than_80_chars String toString() => - 'AuthenticationState(status: $status, user: $user, userData: $userData)'; + 'AuthenticationState(status: $status, user: $user, extra: $extra)'; } diff --git a/packages/wyatt_authentication_bloc/lib/src/email_verification/cubit/email_verification_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart similarity index 81% rename from packages/wyatt_authentication_bloc/lib/src/email_verification/cubit/email_verification_cubit.dart rename to packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart index b5dca156..2ef607a0 100644 --- a/packages/wyatt_authentication_bloc/lib/src/email_verification/cubit/email_verification_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart @@ -14,19 +14,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import 'package:bloc/bloc.dart'; import 'package:equatable/equatable.dart'; -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_interface.dart'; -import 'package:wyatt_authentication_bloc/src/repositories/authentication_repository_interface.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions.dart'; +import 'package:wyatt_authentication_bloc/src/domain/repositories/authentication_repository.dart'; import 'package:wyatt_form_bloc/wyatt_form_bloc.dart' show FormStatus; part 'email_verification_state.dart'; class EmailVerificationCubit extends Cubit { - final AuthenticationRepositoryInterface _authenticationRepository; + final AuthenticationRepository _authenticationRepository; - EmailVerificationCubit(this._authenticationRepository) - : super(const EmailVerificationState()); + EmailVerificationCubit({ + required AuthenticationRepository authenticationRepository, + }) : _authenticationRepository = authenticationRepository, + super(const EmailVerificationState()); Future sendEmailVerification() async { emit(state.copyWith(status: FormStatus.submissionInProgress)); diff --git a/packages/wyatt_authentication_bloc/lib/src/email_verification/cubit/email_verification_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_state.dart similarity index 96% rename from packages/wyatt_authentication_bloc/lib/src/email_verification/cubit/email_verification_state.dart rename to packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_state.dart index 0470429e..f05f2caf 100644 --- a/packages/wyatt_authentication_bloc/lib/src/email_verification/cubit/email_verification_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_state.dart @@ -31,13 +31,11 @@ class EmailVerificationState extends Equatable { bool? isVerified, FormStatus? status, String? errorMessage, - }) { - return EmailVerificationState( + }) => EmailVerificationState( isVerified: isVerified ?? this.isVerified, status: status ?? this.status, errorMessage: errorMessage ?? this.errorMessage, ); - } @override List get props => [isVerified, status]; diff --git a/packages/wyatt_authentication_bloc/lib/src/email_verification/email_verification.dart b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/email_verification.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/email_verification/email_verification.dart rename to packages/wyatt_authentication_bloc/lib/src/features/email_verification/email_verification.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/password_reset/cubit/password_reset_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart similarity index 68% rename from packages/wyatt_authentication_bloc/lib/src/password_reset/cubit/password_reset_cubit.dart rename to packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart index 2252cc3d..66ab6545 100644 --- a/packages/wyatt_authentication_bloc/lib/src/password_reset/cubit/password_reset_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart @@ -14,32 +14,40 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import 'package:bloc/bloc.dart'; import 'package:equatable/equatable.dart'; -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_interface.dart'; -import 'package:wyatt_authentication_bloc/src/repositories/authentication_repository_interface.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions.dart'; +import 'package:wyatt_authentication_bloc/src/domain/repositories/authentication_repository.dart'; import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; part 'password_reset_state.dart'; class PasswordResetCubit extends Cubit { - final AuthenticationRepositoryInterface _authenticationRepository; + final AuthenticationRepository _authenticationRepository; - PasswordResetCubit(this._authenticationRepository) - : super(const PasswordResetState()); + final FormValidator _validationStrategy; + + PasswordResetCubit({ + required AuthenticationRepository authenticationRepository, + FormValidator validationStrategy = const EveryInputValidator(), + }) : _authenticationRepository = authenticationRepository, + _validationStrategy = validationStrategy, + super(const PasswordResetState()); void emailChanged(String value) { final Email email = Email.dirty(value); emit( state.copyWith( email: email, - status: FormStatus.validate([email]), + status: _validationStrategy.rawValidate([email]), ), ); } Future sendPasswordResetEmail() async { - if (!state.status.isValidated) return; + if (!state.status.isValidated) { + return; + } emit(state.copyWith(status: FormStatus.submissionInProgress)); try { await _authenticationRepository.sendPasswordResetEmail( diff --git a/packages/wyatt_authentication_bloc/lib/src/password_reset/cubit/password_reset_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart similarity index 96% rename from packages/wyatt_authentication_bloc/lib/src/password_reset/cubit/password_reset_state.dart rename to packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart index 5d3d7179..e8100c8e 100644 --- a/packages/wyatt_authentication_bloc/lib/src/password_reset/cubit/password_reset_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart @@ -31,13 +31,11 @@ class PasswordResetState extends Equatable { Email? email, FormStatus? status, String? errorMessage, - }) { - return PasswordResetState( + }) => PasswordResetState( email: email ?? this.email, status: status ?? this.status, errorMessage: errorMessage ?? this.errorMessage, ); - } @override List get props => [email, status]; diff --git a/packages/wyatt_authentication_bloc/lib/src/password_reset/password_reset.dart b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/password_reset.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/password_reset/password_reset.dart rename to packages/wyatt_authentication_bloc/lib/src/features/password_reset/password_reset.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/sign_in/cubit/sign_in_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart similarity index 75% rename from packages/wyatt_authentication_bloc/lib/src/sign_in/cubit/sign_in_cubit.dart rename to packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart index b30dbab9..2891dc57 100644 --- a/packages/wyatt_authentication_bloc/lib/src/sign_in/cubit/sign_in_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart @@ -14,24 +14,25 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import 'package:bloc/bloc.dart'; import 'package:equatable/equatable.dart'; -import 'package:wyatt_authentication_bloc/src/authentication/cubit/authentication_cubit.dart'; -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_interface.dart'; -import 'package:wyatt_authentication_bloc/src/repositories/authentication_repository_interface.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/src/core/enum/auth_cubit_status.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions.dart'; +import 'package:wyatt_authentication_bloc/src/domain/repositories/authentication_repository.dart'; import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; part 'sign_in_state.dart'; class SignInCubit extends Cubit { - final AuthenticationRepositoryInterface _authenticationRepository; - final AuthenticationCubit _authenticationCubit; + final AuthenticationRepository _authenticationRepository; + + final FormValidator _validationStrategy; SignInCubit({ - required AuthenticationRepositoryInterface authenticationRepository, - required AuthenticationCubit authenticationCubit, + required AuthenticationRepository authenticationRepository, + FormValidator validationStrategy = const EveryInputValidator(), }) : _authenticationRepository = authenticationRepository, - _authenticationCubit = authenticationCubit, + _validationStrategy = validationStrategy, super(const SignInState()); void emailChanged(String value) { @@ -39,7 +40,7 @@ class SignInCubit extends Cubit { emit( state.copyWith( email: email, - status: FormStatus.validate([email, state.password]), + status: _validationStrategy.rawValidate([email, state.password]), ), ); } @@ -49,7 +50,7 @@ class SignInCubit extends Cubit { emit( state.copyWith( password: password, - status: FormStatus.validate([state.email, password]), + status: _validationStrategy.rawValidate([state.email, password]), ), ); } @@ -62,7 +63,7 @@ class SignInCubit extends Cubit { emit(state.copyWith(status: FormStatus.submissionInProgress)); try { await _authenticationRepository.signInAnonymously(); - _authenticationCubit.start(); + _authenticationRepository.changeCubitStatus(AuthCubitStatus.started); emit(state.copyWith(status: FormStatus.submissionSuccess)); } on SignInAnonymouslyFailureInterface catch (e) { emit( @@ -84,7 +85,7 @@ class SignInCubit extends Cubit { emit(state.copyWith(status: FormStatus.submissionInProgress)); try { await _authenticationRepository.signInWithGoogle(); - _authenticationCubit.start(); + _authenticationRepository.changeCubitStatus(AuthCubitStatus.started); emit(state.copyWith(status: FormStatus.submissionSuccess)); } on SignInWithGoogleFailureInterface catch (e) { emit( @@ -99,14 +100,16 @@ class SignInCubit extends Cubit { } Future signInWithEmailAndPassword() async { - if (!state.status.isValidated) return; + if (!state.status.isValidated) { + return; + } emit(state.copyWith(status: FormStatus.submissionInProgress)); try { await _authenticationRepository.signInWithEmailAndPassword( email: state.email.value, password: state.password.value, ); - _authenticationCubit.start(); + _authenticationRepository.changeCubitStatus(AuthCubitStatus.started); emit(state.copyWith(status: FormStatus.submissionSuccess)); } on SignInWithEmailAndPasswordFailureInterface catch (e) { emit( diff --git a/packages/wyatt_authentication_bloc/lib/src/sign_in/cubit/sign_in_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart similarity index 84% rename from packages/wyatt_authentication_bloc/lib/src/sign_in/cubit/sign_in_state.dart rename to packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart index f59c536c..0e407276 100644 --- a/packages/wyatt_authentication_bloc/lib/src/sign_in/cubit/sign_in_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart @@ -34,25 +34,22 @@ class SignInState extends Equatable { Password? password, FormStatus? status, String? errorMessage, - }) { - return SignInState( - email: email ?? this.email, - password: password ?? this.password, - status: status ?? this.status, - errorMessage: errorMessage ?? this.errorMessage, - ); - } + }) => + SignInState( + email: email ?? this.email, + password: password ?? this.password, + status: status ?? this.status, + errorMessage: errorMessage ?? this.errorMessage, + ); @override List get props => [email, password, status]; @override - String toString() { - return ''' + String toString() => ''' email: $email, password: $password, status: $status, errorMessage: $errorMessage, '''; - } } diff --git a/packages/wyatt_authentication_bloc/lib/src/sign_in/sign_in.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/sign_in.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/sign_in/sign_in.dart rename to packages/wyatt_authentication_bloc/lib/src/features/sign_in/sign_in.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/sign_up/cubit/sign_up_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart similarity index 64% rename from packages/wyatt_authentication_bloc/lib/src/sign_up/cubit/sign_up_cubit.dart rename to packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart index 31556053..3e79b7a8 100644 --- a/packages/wyatt_authentication_bloc/lib/src/sign_up/cubit/sign_up_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart @@ -16,30 +16,31 @@ import 'dart:async'; -import 'package:bloc/bloc.dart'; +import 'package:equatable/equatable.dart'; import 'package:flutter/foundation.dart'; -import 'package:wyatt_authentication_bloc/src/authentication/cubit/authentication_cubit.dart'; -import 'package:wyatt_authentication_bloc/src/models/exceptions/exceptions_interface.dart'; -import 'package:wyatt_authentication_bloc/src/repositories/authentication_repository_interface.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wyatt_authentication_bloc/src/core/enum/auth_cubit_status.dart'; +import 'package:wyatt_authentication_bloc/src/core/exceptions/exceptions.dart'; +import 'package:wyatt_authentication_bloc/src/domain/repositories/authentication_repository.dart'; import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; part 'sign_up_state.dart'; class SignUpCubit extends Cubit { - final AuthenticationRepositoryInterface _authenticationRepository; - final AuthenticationCubit _authenticationCubit; + final AuthenticationRepository _authenticationRepository; - final Future Function(SignUpState state, String? uid)? _onSignUpSuccess; + final Future Function(SignUpState state, String? uid)? _onSignUpSuccess; + final FormValidator _validationStrategy; SignUpCubit({ - required AuthenticationRepositoryInterface authenticationRepository, - required AuthenticationCubit authenticationCubit, - required FormData entries, - Future Function(SignUpState state, String? uid)? onSignUpSuccess, + required AuthenticationRepository authenticationRepository, + required FormData formData, + FormValidator validationStrategy = const EveryInputValidator(), + Future Function(SignUpState state, String? uid)? onSignUpSuccess, }) : _authenticationRepository = authenticationRepository, - _authenticationCubit = authenticationCubit, _onSignUpSuccess = onSignUpSuccess, - super(SignUpState(data: entries)); + _validationStrategy = validationStrategy, + super(SignUpState(data: formData)); void emailChanged(String value) { final Email email = Email.dirty(value); @@ -53,7 +54,7 @@ class SignUpCubit extends Cubit { emit( state.copyWith( email: email, - status: FormStatus.validate(toValidate), + status: _validationStrategy.rawValidate(toValidate), ), ); } @@ -70,25 +71,28 @@ class SignUpCubit extends Cubit { emit( state.copyWith( password: password, - status: FormStatus.validate(toValidate), + status: _validationStrategy.rawValidate(toValidate), ), ); } // Take from wyatt_form_bloc/wyatt_form_bloc.dart - void dataChanged(String field, FormInputValidator dirtyValue) { - final _form = state.data.clone(); + void dataChanged( + String field, + FormInputValidator dirtyValue, + ) { + final form = state.data.clone(); - if (_form.contains(field)) { - _form.updateValidator(field, dirtyValue); + if (form.contains(field)) { + form.updateValidator(field, dirtyValue); } else { throw Exception('Form field $field not found'); } emit( state.copyWith( - data: _form, - status: FormStatus.validate( + data: form, + status: _validationStrategy.rawValidate( [ state.email, state.password, @@ -104,27 +108,27 @@ class SignUpCubit extends Cubit { FormData data, { SetOperation operation = SetOperation.replace, }) { - FormData _form = data; + FormData form = data; switch (operation) { case SetOperation.replace: - _form = data; + form = data; break; case SetOperation.difference: - _form = state.data.difference(data); + form = state.data.difference(data); break; case SetOperation.intersection: - _form = state.data.intersection(data); + form = state.data.intersection(data); break; case SetOperation.union: - _form = state.data.union(data); + form = state.data.union(data); break; } emit( state.copyWith( - data: _form, - status: FormStatus.validate( + data: form, + status: _validationStrategy.rawValidate( [ state.email, state.password, @@ -136,7 +140,9 @@ class SignUpCubit extends Cubit { } Future signUpFormSubmitted() async { - if (!state.status.isValidated) return; + if (!state.status.isValidated) { + return; + } emit(state.copyWith(status: FormStatus.submissionInProgress)); try { final uid = await _authenticationRepository.signUp( @@ -144,16 +150,8 @@ class SignUpCubit extends Cubit { password: state.password.value, ); await _onSignUpSuccess?.call(state, uid); - if (_authenticationCubit.start()) { - emit(state.copyWith(status: FormStatus.submissionSuccess)); - } else { - emit( - state.copyWith( - errorMessage: 'Failed to start authentication cubit', - status: FormStatus.submissionFailure, - ), - ); - } + _authenticationRepository.changeCubitStatus(AuthCubitStatus.started); + emit(state.copyWith(status: FormStatus.submissionSuccess)); } on SignUpWithEmailAndPasswordFailureInterface catch (e) { emit( state.copyWith( diff --git a/packages/wyatt_authentication_bloc/lib/src/sign_up/cubit/sign_up_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart similarity index 57% rename from packages/wyatt_authentication_bloc/lib/src/sign_up/cubit/sign_up_state.dart rename to packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart index ce493838..fefe5325 100644 --- a/packages/wyatt_authentication_bloc/lib/src/sign_up/cubit/sign_up_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart @@ -16,8 +16,7 @@ part of 'sign_up_cubit.dart'; -@immutable -class SignUpState { +class SignUpState extends Equatable { final Email email; final Password password; final FormStatus status; @@ -25,10 +24,10 @@ class SignUpState { final String? errorMessage; const SignUpState({ + required this.data, this.email = const Email.pure(), this.password = const Password.pure(), this.status = FormStatus.pure, - required this.data, this.errorMessage, }); @@ -38,40 +37,19 @@ class SignUpState { FormStatus? status, FormData? data, String? errorMessage, - }) { - return SignUpState( - email: email ?? this.email, - password: password ?? this.password, - status: status ?? this.status, - data: data ?? this.data, - errorMessage: errorMessage ?? this.errorMessage, - ); - } + }) => + SignUpState( + email: email ?? this.email, + password: password ?? this.password, + status: status ?? this.status, + data: data ?? this.data, + errorMessage: errorMessage ?? this.errorMessage, + ); @override - bool operator ==(Object other) { - if (identical(this, other)) return true; - - return other is SignUpState && - other.email == email && - other.password == password && - other.status == status && - other.data == data && - other.errorMessage == errorMessage; - } + String toString() => 'SignUpState(email: $email, password: $password, ' + 'status: $status, data: $data, errorMessage: $errorMessage)'; @override - int get hashCode { - return email.hashCode ^ - password.hashCode ^ - status.hashCode ^ - data.hashCode ^ - errorMessage.hashCode; - } - - @override - String toString() { - // ignore: lines_longer_than_80_chars - return 'SignUpState(email: $email, password: $password, status: $status, data: $data, errorMessage: $errorMessage)'; - } + List get props => [email, password, status, data, errorMessage]; } diff --git a/packages/wyatt_authentication_bloc/lib/src/sign_up/sign_up.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/sign_up.dart similarity index 100% rename from packages/wyatt_authentication_bloc/lib/src/sign_up/sign_up.dart rename to packages/wyatt_authentication_bloc/lib/src/features/sign_up/sign_up.dart diff --git a/packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions.dart b/packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions.dart deleted file mode 100644 index 75da2bc7..00000000 --- a/packages/wyatt_authentication_bloc/lib/src/models/exceptions/exceptions.dart +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2022 WYATT GROUP -// Please see the AUTHORS file for details. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -export 'exceptions_firebase.dart'; -export 'exceptions_interface.dart'; diff --git a/packages/wyatt_authentication_bloc/lib/src/models/models.dart b/packages/wyatt_authentication_bloc/lib/src/models/models.dart deleted file mode 100644 index 1bd2db89..00000000 --- a/packages/wyatt_authentication_bloc/lib/src/models/models.dart +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2022 WYATT GROUP -// Please see the AUTHORS file for details. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -export 'exceptions/exceptions.dart'; -export 'user/user.dart'; diff --git a/packages/wyatt_authentication_bloc/lib/src/src.dart b/packages/wyatt_authentication_bloc/lib/src/src.dart index 6b879865..62ba6ef9 100644 --- a/packages/wyatt_authentication_bloc/lib/src/src.dart +++ b/packages/wyatt_authentication_bloc/lib/src/src.dart @@ -14,10 +14,17 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -export 'authentication/authentication.dart'; -export 'email_verification/email_verification.dart'; -export 'models/models.dart'; -export 'password_reset/password_reset.dart'; -export 'repositories/repositories.dart'; -export 'sign_in/sign_in.dart'; -export 'sign_up/sign_up.dart'; +export 'core/enum/auth_cubit_status.dart'; +export 'core/exceptions/exceptions.dart'; +export 'core/exceptions/exceptions_firebase.dart'; +export 'core/extensions/firebase_auth_user_x.dart'; +export 'core/utils/cryptography.dart'; +export 'data/models/user_firebase.dart'; +export 'data/repositories/authentication_repository_firebase.dart'; +export 'domain/entities/user.dart'; +export 'domain/repositories/authentication_repository.dart'; +export 'features/authentication/authentication.dart'; +export 'features/email_verification/email_verification.dart'; +export 'features/password_reset/password_reset.dart'; +export 'features/sign_in/sign_in.dart'; +export 'features/sign_up/sign_up.dart'; diff --git a/packages/wyatt_authentication_bloc/pubspec.yaml b/packages/wyatt_authentication_bloc/pubspec.yaml index ac4ae6aa..c4b299b6 100644 --- a/packages/wyatt_authentication_bloc/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/mas version: 0.2.1+3 environment: - sdk: ">=2.15.1 <3.0.0" + sdk: ">=2.17.0 <3.0.0" flutter: ">=1.17.0" dependencies: @@ -31,6 +31,7 @@ dev_dependencies: flutter_test: sdk: flutter bloc_test: ^9.0.3 + mocktail: ^0.3.0 wyatt_analysis: git: diff --git a/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart b/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart index 3b743aaf..95708942 100644 --- a/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart @@ -20,66 +20,87 @@ import 'package:mocktail/mocktail.dart'; import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; class MockAuthenticationRepository extends Mock - implements AuthenticationRepositoryInterface {} + implements AuthenticationRepository {} -class MockUser extends Mock implements UserInterface {} +class MockUser extends Mock implements User {} void main() { - group('AuthenticationCubit', () { + group('AuthenticationCubit', () { final MockUser user = MockUser(); - late AuthenticationRepositoryInterface authenticationRepository; + late AuthenticationRepository authenticationRepository; setUp(() { authenticationRepository = MockAuthenticationRepository(); when(() => authenticationRepository.user).thenAnswer( (_) => const Stream.empty(), ); + when(() => authenticationRepository.cubitStatus).thenAnswer( + (_) => Stream.fromIterable([AuthCubitStatus.stoped]), + ); when( () => authenticationRepository.currentUser, - ).thenReturn(const UserFirebase.empty()); + ).thenReturn(user); }); - test('initial state is unknown', () { + test('initial auth state is `unknown`', () { expect( - AuthenticationCubit(authenticationRepository: authenticationRepository) - .state, - const AuthenticationState.unknown(), + AuthenticationCubit( + authenticationRepository: authenticationRepository, + ).state, + const AuthenticationState.unknown(), + ); + }); + + test('initial cubit status is `stoped`', () async { + expect( + await AuthenticationCubit( + authenticationRepository: authenticationRepository, + ).status, + AuthCubitStatus.stoped, ); }); group('UserChanged', () { - blocTest( + blocTest, AuthenticationState>( 'emits authenticated when user is not empty', setUp: () { when(() => user.isNotEmpty).thenReturn(true); when(() => authenticationRepository.user).thenAnswer( (_) => Stream.value(user), ); - }, - build: () => AuthenticationCubit( - authenticationRepository: authenticationRepository, - )..init(), - seed: () => const AuthenticationState.unknown(), - expect: () => [AuthenticationState.authenticated(user, null)], - ); - - blocTest( - 'emits unauthenticated when user is empty', - setUp: () { - when(() => authenticationRepository.user).thenAnswer( - (_) => Stream.value(const UserFirebase.empty()), + when(() => authenticationRepository.cubitStatus).thenAnswer( + (_) => Stream.value(AuthCubitStatus.started), ); }, build: () => AuthenticationCubit( authenticationRepository: authenticationRepository, )..init(), seed: () => const AuthenticationState.unknown(), - expect: () => [const AuthenticationState.unauthenticated()], + expect: () => [AuthenticationState.authenticated(user, null)], + ); + + blocTest, AuthenticationState>( + 'emits unauthenticated when user is empty', + setUp: () { + when(() => user.isEmpty).thenReturn(true); + when(() => user.isNotEmpty).thenReturn(false); + when(() => authenticationRepository.user).thenAnswer( + (_) => Stream.value(user), + ); + when(() => authenticationRepository.cubitStatus).thenAnswer( + (_) => Stream.value(AuthCubitStatus.started), + ); + }, + build: () => AuthenticationCubit( + authenticationRepository: authenticationRepository, + )..init(), + seed: () => const AuthenticationState.unknown(), + expect: () => [const AuthenticationState.unauthenticated()], ); }); group('LogoutRequested', () { - blocTest( + blocTest, AuthenticationState>( 'invokes signOut', setUp: () { when( @@ -89,7 +110,7 @@ void main() { build: () => AuthenticationCubit( authenticationRepository: authenticationRepository, ), - act: (AuthenticationCubit cubit) => cubit.logOut(), + act: (cubit) => cubit.logOut(), verify: (_) { verify(() => authenticationRepository.signOut()).called(1); }, diff --git a/packages/wyatt_authentication_bloc/test/authentication/authentication_state_test.dart b/packages/wyatt_authentication_bloc/test/authentication/authentication_state_test.dart index 69279523..d7ce2cb2 100644 --- a/packages/wyatt_authentication_bloc/test/authentication/authentication_state_test.dart +++ b/packages/wyatt_authentication_bloc/test/authentication/authentication_state_test.dart @@ -18,13 +18,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; -class MockUser extends Mock implements UserInterface {} +class MockUser extends Mock implements User {} void main() { group('AuthenticationState', () { group('unauthenticated', () { test('has correct status', () { - const AuthenticationState state = AuthenticationState.unauthenticated(); + const AuthenticationState state = + AuthenticationState.unauthenticated(); expect(state.status, AuthenticationStatus.unauthenticated); expect(state.user, null); }); @@ -33,11 +34,23 @@ void main() { group('authenticated', () { test('has correct status', () { final MockUser user = MockUser(); - final AuthenticationState state = + final AuthenticationState state = AuthenticationState.authenticated(user, null); expect(state.status, AuthenticationStatus.authenticated); expect(state.user, user); }); }); + + group('authenticated with extra data', () { + test('has correct status', () { + final MockUser user = MockUser(); + const String extra = 'AwesomeExtraData'; + final AuthenticationState state = + AuthenticationState.authenticated(user, extra); + expect(state.status, AuthenticationStatus.authenticated); + expect(state.user, user); + expect(state.extra, extra); + }); + }); }); } diff --git a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart index c3c0757e..866ed2ca 100644 --- a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart @@ -21,9 +21,10 @@ import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; class MockAuthenticationRepository extends Mock - implements AuthenticationRepositoryInterface {} + implements AuthenticationRepository {} -class MockAuthenticationCubit extends Mock implements AuthenticationCubit {} +class MockAuthenticationCubit extends Mock + implements AuthenticationCubit {} void main() { const String invalidEmailString = 'invalid'; @@ -39,8 +40,8 @@ void main() { const Password validPassword = Password.dirty(validPasswordString); group('SignInCubit', () { - late AuthenticationRepositoryInterface authenticationRepository; - late AuthenticationCubit authenticationCubit; + late AuthenticationRepository authenticationRepository; + late AuthenticationCubit authenticationCubit; setUp(() { authenticationRepository = MockAuthenticationRepository(); @@ -62,7 +63,6 @@ void main() { expect( SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ).state, const SignInState(), ); @@ -73,9 +73,8 @@ void main() { 'emits [invalid] when email/password are invalid', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), - act: (SignInCubit cubit) => cubit.emailChanged(invalidEmailString), + act: (cubit) => cubit.emailChanged(invalidEmailString), expect: () => const [ SignInState(email: invalidEmail, status: FormStatus.invalid), ], @@ -85,10 +84,9 @@ void main() { 'emits [valid] when email/password are valid', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), seed: () => const SignInState(password: validPassword), - act: (SignInCubit cubit) => cubit.emailChanged(validEmailString), + act: (cubit) => cubit.emailChanged(validEmailString), expect: () => const [ SignInState( email: validEmail, @@ -104,10 +102,8 @@ void main() { 'emits [invalid] when email/password are invalid', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), - act: (SignInCubit cubit) => - cubit.passwordChanged(invalidPasswordString), + act: (cubit) => cubit.passwordChanged(invalidPasswordString), expect: () => const [ SignInState( password: invalidPassword, @@ -120,10 +116,9 @@ void main() { 'emits [valid] when email/password are valid', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), seed: () => const SignInState(email: validEmail), - act: (SignInCubit cubit) => cubit.passwordChanged(validPasswordString), + act: (cubit) => cubit.passwordChanged(validPasswordString), expect: () => const [ SignInState( email: validEmail, @@ -139,9 +134,8 @@ void main() { 'does nothing when status is not validated', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), - act: (SignInCubit cubit) => cubit.signInWithEmailAndPassword(), + act: (cubit) => cubit.signInWithEmailAndPassword(), expect: () => const [], ); @@ -149,14 +143,13 @@ void main() { 'calls signInWithEmailAndPassword with correct email/password', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), seed: () => const SignInState( status: FormStatus.valid, email: validEmail, password: validPassword, ), - act: (SignInCubit cubit) => cubit.signInWithEmailAndPassword(), + act: (cubit) => cubit.signInWithEmailAndPassword(), verify: (_) { verify( () => authenticationRepository.signInWithEmailAndPassword( @@ -172,14 +165,13 @@ void main() { 'when signInWithEmailAndPassword succeeds', build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), seed: () => const SignInState( status: FormStatus.valid, email: validEmail, password: validPassword, ), - act: (SignInCubit cubit) => cubit.signInWithEmailAndPassword(), + act: (cubit) => cubit.signInWithEmailAndPassword(), expect: () => const [ SignInState( status: FormStatus.submissionInProgress, @@ -207,14 +199,13 @@ void main() { }, build: () => SignInCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, ), seed: () => const SignInState( status: FormStatus.valid, email: validEmail, password: validPassword, ), - act: (SignInCubit cubit) => cubit.signInWithEmailAndPassword(), + act: (cubit) => cubit.signInWithEmailAndPassword(), expect: () => const [ SignInState( status: FormStatus.submissionInProgress, diff --git a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart index 08977706..0e3de2d5 100644 --- a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart @@ -21,9 +21,10 @@ import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; class MockAuthenticationRepository extends Mock - implements AuthenticationRepositoryInterface {} + implements AuthenticationRepository {} -class MockAuthenticationCubit extends Mock implements AuthenticationCubit {} +class MockAuthenticationCubit extends Mock + implements AuthenticationCubit {} void main() { const String invalidEmailString = 'invalid'; @@ -39,8 +40,8 @@ void main() { const Password validPassword = Password.dirty(validPasswordString); group('SignUpCubit', () { - late AuthenticationRepositoryInterface authenticationRepository; - late AuthenticationCubit authenticationCubit; + late AuthenticationRepository authenticationRepository; + late AuthenticationCubit authenticationCubit; setUp(() { authenticationRepository = MockAuthenticationRepository(); @@ -50,9 +51,7 @@ void main() { email: any(named: 'email'), password: any(named: 'password'), ), - ).thenAnswer((_) async { - return 'uid'; - }); + ).thenAnswer((_) async => 'uid'); when( () => authenticationCubit.start(), @@ -67,8 +66,7 @@ void main() { expect( SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ).state, const SignUpState(data: FormData.empty()), ); @@ -79,10 +77,9 @@ void main() { 'emits [invalid] when email/password are invalid', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.emailChanged(invalidEmailString), + act: (cubit) => cubit.emailChanged(invalidEmailString), expect: () => [ const SignUpState( email: invalidEmail, @@ -96,14 +93,13 @@ void main() { 'emits [valid] when email/password are valid', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), seed: () => const SignUpState( password: validPassword, data: FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.emailChanged(validEmailString), + act: (cubit) => cubit.emailChanged(validEmailString), expect: () => [ const SignUpState( email: validEmail, @@ -120,11 +116,9 @@ void main() { 'emits [invalid] when email/password are invalid', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), - act: (SignUpCubit cubit) => - cubit.passwordChanged(invalidPasswordString), + act: (cubit) => cubit.passwordChanged(invalidPasswordString), expect: () => [ const SignUpState( password: invalidPassword, @@ -138,14 +132,13 @@ void main() { 'emits [valid] when email/password are valid', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), seed: () => const SignUpState( email: validEmail, data: FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.passwordChanged(validPasswordString), + act: (cubit) => cubit.passwordChanged(validPasswordString), expect: () => [ const SignUpState( email: validEmail, @@ -162,10 +155,9 @@ void main() { 'does nothing when status is not validated', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.signUpFormSubmitted(), + act: (cubit) => cubit.signUpFormSubmitted(), expect: () => const [], ); @@ -173,8 +165,7 @@ void main() { 'calls signUp with correct email/password/confirmedPassword', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), seed: () => const SignUpState( status: FormStatus.valid, @@ -182,7 +173,7 @@ void main() { password: validPassword, data: FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.signUpFormSubmitted(), + act: (cubit) => cubit.signUpFormSubmitted(), verify: (_) { verify( () => authenticationRepository.signUp( @@ -198,8 +189,7 @@ void main() { 'when signUp succeeds', build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), seed: () => const SignUpState( status: FormStatus.valid, @@ -207,7 +197,7 @@ void main() { password: validPassword, data: FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.signUpFormSubmitted(), + act: (cubit) => cubit.signUpFormSubmitted(), expect: () => [ const SignUpState( status: FormStatus.submissionInProgress, @@ -237,8 +227,7 @@ void main() { }, build: () => SignUpCubit( authenticationRepository: authenticationRepository, - authenticationCubit: authenticationCubit, - entries: const FormData.empty(), + formData: const FormData.empty(), ), seed: () => const SignUpState( status: FormStatus.valid, @@ -246,7 +235,7 @@ void main() { password: validPassword, data: FormData.empty(), ), - act: (SignUpCubit cubit) => cubit.signUpFormSubmitted(), + act: (cubit) => cubit.signUpFormSubmitted(), expect: () => [ const SignUpState( status: FormStatus.submissionInProgress, From 7f56752fa7608ad22d1593de29c2f4921a23f8fd Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Fri, 26 Aug 2022 13:43:39 +0200 Subject: [PATCH 10/12] style(auth): reformat some files --- .../lib/src/core/exceptions/exceptions.dart | 106 +++++++----------- .../core/exceptions/exceptions_firebase.dart | 19 ++-- 2 files changed, 48 insertions(+), 77 deletions(-) diff --git a/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart index 4a1d26b8..44f258f7 100644 --- a/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart @@ -29,11 +29,10 @@ abstract class AuthenticationFailureInterface implements Exception { abstract class ApplyActionCodeFailureInterface extends AuthenticationFailureInterface { /// {@macro apply_action_code_failure} - ApplyActionCodeFailureInterface(String code, String message) - : super(code, message); + ApplyActionCodeFailureInterface(super.code, super.message); /// {@macro apply_action_code_failure} - ApplyActionCodeFailureInterface.fromCode(String code) : super.fromCode(code); + ApplyActionCodeFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_up_with_email_and_password_failure} @@ -42,12 +41,11 @@ abstract class ApplyActionCodeFailureInterface abstract class SignUpWithEmailAndPasswordFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_up_with_email_and_password_failure} - SignUpWithEmailAndPasswordFailureInterface(String code, String message) - : super(code, message); + SignUpWithEmailAndPasswordFailureInterface(super.code, super.message); /// {@macro sign_up_with_email_and_password_failure} - SignUpWithEmailAndPasswordFailureInterface.fromCode(String code) - : super.fromCode(code); + SignUpWithEmailAndPasswordFailureInterface.fromCode(super.code) + : super.fromCode(); } /// {@template fetch_sign_in_methods_failure} @@ -56,12 +54,11 @@ abstract class SignUpWithEmailAndPasswordFailureInterface abstract class FetchSignInMethodsForEmailFailureInterface extends AuthenticationFailureInterface { /// {@macro fetch_sign_in_methods_failure} - FetchSignInMethodsForEmailFailureInterface(String code, String message) - : super(code, message); + FetchSignInMethodsForEmailFailureInterface(super.code, super.message); /// {@macro fetch_sign_in_methods_failure} - FetchSignInMethodsForEmailFailureInterface.fromCode(String code) - : super.fromCode(code); + FetchSignInMethodsForEmailFailureInterface.fromCode(super.code) + : super.fromCode(); } /// {@template sign_in_with_credential_failure} @@ -70,12 +67,10 @@ abstract class FetchSignInMethodsForEmailFailureInterface abstract class SignInWithCredentialFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_credential_failure} - SignInWithCredentialFailureInterface(String code, String message) - : super(code, message); + SignInWithCredentialFailureInterface(super.code, super.message); /// {@macro sign_in_with_credential_failure} - SignInWithCredentialFailureInterface.fromCode(String code) - : super.fromCode(code); + SignInWithCredentialFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_anonymously_failure} @@ -84,12 +79,10 @@ abstract class SignInWithCredentialFailureInterface abstract class SignInAnonymouslyFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_anonymously_failure} - SignInAnonymouslyFailureInterface(String code, String message) - : super(code, message); + SignInAnonymouslyFailureInterface(super.code, super.message); /// {@macro sign_in_anonymously_failure} - SignInAnonymouslyFailureInterface.fromCode(String code) - : super.fromCode(code); + SignInAnonymouslyFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_with_google_failure} @@ -98,11 +91,10 @@ abstract class SignInAnonymouslyFailureInterface abstract class SignInWithGoogleFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_google_failure} - SignInWithGoogleFailureInterface(String code, String message) - : super(code, message); + SignInWithGoogleFailureInterface(super.code, super.message); /// {@macro sign_in_with_google_failure} - SignInWithGoogleFailureInterface.fromCode(String code) : super.fromCode(code); + SignInWithGoogleFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_with_facebook_failure} @@ -111,12 +103,10 @@ abstract class SignInWithGoogleFailureInterface abstract class SignInWithFacebookFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_facebook_failure} - SignInWithFacebookFailureInterface(String code, String message) - : super(code, message); + SignInWithFacebookFailureInterface(super.code, super.message); /// {@macro sign_in_with_facebook_failure} - SignInWithFacebookFailureInterface.fromCode(String code) - : super.fromCode(code); + SignInWithFacebookFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_with_apple_failure} @@ -125,11 +115,10 @@ abstract class SignInWithFacebookFailureInterface abstract class SignInWithAppleFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_apple_failure} - SignInWithAppleFailureInterface(String code, String message) - : super(code, message); + SignInWithAppleFailureInterface(super.code, super.message); /// {@macro sign_in_with_apple_failure} - SignInWithAppleFailureInterface.fromCode(String code) : super.fromCode(code); + SignInWithAppleFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_with_twitter_failure} @@ -138,12 +127,10 @@ abstract class SignInWithAppleFailureInterface abstract class SignInWithTwitterFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_twitter_failure} - SignInWithTwitterFailureInterface(String code, String message) - : super(code, message); + SignInWithTwitterFailureInterface(super.code, super.message); /// {@macro sign_in_with_twitter_failure} - SignInWithTwitterFailureInterface.fromCode(String code) - : super.fromCode(code); + SignInWithTwitterFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_with_email_link_failure} @@ -152,12 +139,10 @@ abstract class SignInWithTwitterFailureInterface abstract class SignInWithEmailLinkFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_email_link_failure} - SignInWithEmailLinkFailureInterface(String code, String message) - : super(code, message); + SignInWithEmailLinkFailureInterface(super.code, super.message); /// {@macro sign_in_with_email_link_failure} - SignInWithEmailLinkFailureInterface.fromCode(String code) - : super.fromCode(code); + SignInWithEmailLinkFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_in_with_email_and_password_failure} @@ -166,12 +151,11 @@ abstract class SignInWithEmailLinkFailureInterface abstract class SignInWithEmailAndPasswordFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_in_with_email_and_password_failure} - SignInWithEmailAndPasswordFailureInterface(String code, String message) - : super(code, message); + SignInWithEmailAndPasswordFailureInterface(super.code, super.message); /// {@macro sign_in_with_email_and_password_failure} - SignInWithEmailAndPasswordFailureInterface.fromCode(String code) - : super.fromCode(code); + SignInWithEmailAndPasswordFailureInterface.fromCode(super.code) + : super.fromCode(); } /// {@template send_email_verification_failure} @@ -180,12 +164,10 @@ abstract class SignInWithEmailAndPasswordFailureInterface abstract class SendEmailVerificationFailureInterface extends AuthenticationFailureInterface { /// {@macro send_email_verification_failure} - SendEmailVerificationFailureInterface(String code, String message) - : super(code, message); + SendEmailVerificationFailureInterface(super.code, super.message); /// {@macro send_email_verification_failure} - SendEmailVerificationFailureInterface.fromCode(String code) - : super.fromCode(code); + SendEmailVerificationFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template send_password_reset_email_failure} @@ -194,12 +176,11 @@ abstract class SendEmailVerificationFailureInterface abstract class SendPasswordResetEmailFailureInterface extends AuthenticationFailureInterface { /// {@macro send_password_reset_email_failure} - SendPasswordResetEmailFailureInterface(String code, String message) - : super(code, message); + SendPasswordResetEmailFailureInterface(super.code, super.message); /// {@macro send_password_reset_email_failure} - SendPasswordResetEmailFailureInterface.fromCode(String code) - : super.fromCode(code); + SendPasswordResetEmailFailureInterface.fromCode(super.code) + : super.fromCode(); } /// {@template send_sign_in_link_email_failure} @@ -208,12 +189,10 @@ abstract class SendPasswordResetEmailFailureInterface abstract class SendSignInLinkEmailFailureInterface extends AuthenticationFailureInterface { /// {@macro send_sign_in_link_email_failure} - SendSignInLinkEmailFailureInterface(String code, String message) - : super(code, message); + SendSignInLinkEmailFailureInterface(super.code, super.message); /// {@macro send_sign_in_link_email_failure} - SendSignInLinkEmailFailureInterface.fromCode(String code) - : super.fromCode(code); + SendSignInLinkEmailFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template confirm_password_reset_failure} @@ -222,12 +201,10 @@ abstract class SendSignInLinkEmailFailureInterface abstract class ConfirmPasswordResetFailureInterface extends AuthenticationFailureInterface { /// {@macro confirm_password_reset_failure} - ConfirmPasswordResetFailureInterface(String code, String message) - : super(code, message); + ConfirmPasswordResetFailureInterface(super.code, super.message); /// {@macro confirm_password_reset_failure} - ConfirmPasswordResetFailureInterface.fromCode(String code) - : super.fromCode(code); + ConfirmPasswordResetFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template verify_password_reset_code_failure} @@ -236,12 +213,11 @@ abstract class ConfirmPasswordResetFailureInterface abstract class VerifyPasswordResetCodeFailureInterface extends AuthenticationFailureInterface { /// {@macro verify_password_reset_code_failure} - VerifyPasswordResetCodeFailureInterface(String code, String message) - : super(code, message); + VerifyPasswordResetCodeFailureInterface(super.code, super.message); /// {@macro verify_password_reset_code_failure} - VerifyPasswordResetCodeFailureInterface.fromCode(String code) - : super.fromCode(code); + VerifyPasswordResetCodeFailureInterface.fromCode(super.code) + : super.fromCode(); } /// {@template refresh_failure} @@ -249,10 +225,10 @@ abstract class VerifyPasswordResetCodeFailureInterface /// {@endtemplate} abstract class RefreshFailureInterface extends AuthenticationFailureInterface { /// {@macro refresh_failure} - RefreshFailureInterface(String code, String message) : super(code, message); + RefreshFailureInterface(super.code, super.message); /// {@macro refresh_failure} - RefreshFailureInterface.fromCode(String code) : super.fromCode(code); + RefreshFailureInterface.fromCode(super.code) : super.fromCode(); } /// {@template sign_out_failure} @@ -260,8 +236,8 @@ abstract class RefreshFailureInterface extends AuthenticationFailureInterface { /// {@endtemplate} abstract class SignOutFailureInterface extends AuthenticationFailureInterface { /// {@macro sign_out_failure} - SignOutFailureInterface(String code, String message) : super(code, message); + SignOutFailureInterface(super.code, super.message); /// {@macro sign_out_failure} - SignOutFailureInterface.fromCode(String code) : super.fromCode(code); + SignOutFailureInterface.fromCode(super.code) : super.fromCode(); } diff --git a/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart index 83c911a1..a2d2c108 100644 --- a/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart @@ -156,8 +156,7 @@ class SignInWithFacebookFailureFirebase extends SignInWithCredentialFailureFirebase implements SignInWithFacebookFailureInterface { SignInWithFacebookFailureFirebase([super.code, super.message]); - SignInWithFacebookFailureFirebase.fromCode(super.code) - : super.fromCode(); + SignInWithFacebookFailureFirebase.fromCode(super.code) : super.fromCode(); } class SignInWithAppleFailureFirebase extends SignInWithCredentialFailureFirebase @@ -166,13 +165,13 @@ class SignInWithAppleFailureFirebase extends SignInWithCredentialFailureFirebase SignInWithAppleFailureFirebase.fromCode(super.code) : super.fromCode(); } -class SignInWithTwitterFailureFirebase extends SignInWithCredentialFailureFirebase +class SignInWithTwitterFailureFirebase + extends SignInWithCredentialFailureFirebase implements SignInWithAppleFailureInterface { SignInWithTwitterFailureFirebase([super.code, super.message]); SignInWithTwitterFailureFirebase.fromCode(super.code) : super.fromCode(); } - class SignInWithEmailLinkFailureFirebase extends SignInWithEmailLinkFailureInterface { SignInWithEmailLinkFailureFirebase([String? code, String? message]) @@ -229,16 +228,14 @@ class SendEmailVerificationFailureFirebase SendEmailVerificationFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SendEmailVerificationFailureFirebase.fromCode(super.code) - : super.fromCode(); + SendEmailVerificationFailureFirebase.fromCode(super.code) : super.fromCode(); } class SendPasswordResetEmailFailureFirebase extends SendPasswordResetEmailFailureInterface { SendPasswordResetEmailFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SendPasswordResetEmailFailureFirebase.fromCode(super.code) - : super.fromCode(); + SendPasswordResetEmailFailureFirebase.fromCode(super.code) : super.fromCode(); } class SendSignInLinkEmailFailureFirebase @@ -246,8 +243,7 @@ class SendSignInLinkEmailFailureFirebase SendSignInLinkEmailFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - SendSignInLinkEmailFailureFirebase.fromCode(super.code) - : super.fromCode(); + SendSignInLinkEmailFailureFirebase.fromCode(super.code) : super.fromCode(); } class ConfirmPasswordResetFailureFirebase @@ -255,8 +251,7 @@ class ConfirmPasswordResetFailureFirebase ConfirmPasswordResetFailureFirebase([String? code, String? message]) : super(code ?? 'unknown', message ?? 'An unknown error occurred.'); - ConfirmPasswordResetFailureFirebase.fromCode(super.code) - : super.fromCode(); + ConfirmPasswordResetFailureFirebase.fromCode(super.code) : super.fromCode(); } class VerifyPasswordResetCodeFailureFirebase From 719fa83576f11f3742d3c5cbcfedd69b17e7d037 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Fri, 26 Aug 2022 13:44:00 +0200 Subject: [PATCH 11/12] chore(release): publish packages - wyatt_form_bloc@0.0.6 - wyatt_authentication_bloc@0.2.1+4 --- CHANGELOG.md | 28 +++++++++++++++++++ .../wyatt_authentication_bloc/CHANGELOG.md | 4 +++ .../example/pubspec.yaml | 2 +- .../example_router/pubspec.yaml | 2 +- .../wyatt_authentication_bloc/pubspec.yaml | 4 +-- packages/wyatt_form_bloc/CHANGELOG.md | 4 +++ packages/wyatt_form_bloc/pubspec.yaml | 2 +- 7 files changed, 41 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d8415bb..ba36cd08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,34 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2022-08-26 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`wyatt_form_bloc` - `v0.0.6`](#wyatt_form_bloc---v006) + - [`wyatt_authentication_bloc` - `v0.2.1+4`](#wyatt_authentication_bloc---v0214) + +Packages with dependency updates only: + +> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project. + + - `wyatt_authentication_bloc` - `v0.2.1+4` + +--- + +#### `wyatt_form_bloc` - `v0.0.6` + + - **FEAT**: add raw form validator. + + ## 2022-08-25 ### Changes diff --git a/packages/wyatt_authentication_bloc/CHANGELOG.md b/packages/wyatt_authentication_bloc/CHANGELOG.md index 8c7c3ed5..facdd31a 100644 --- a/packages/wyatt_authentication_bloc/CHANGELOG.md +++ b/packages/wyatt_authentication_bloc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.1+4 + + - Update a dependency to the latest release. + ## 0.2.1+3 - Update a dependency to the latest release. diff --git a/packages/wyatt_authentication_bloc/example/pubspec.yaml b/packages/wyatt_authentication_bloc/example/pubspec.yaml index c8310524..51b2bd64 100644 --- a/packages/wyatt_authentication_bloc/example/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.5 + ref: wyatt_form_bloc-v0.0.6 path: packages/wyatt_form_bloc # The following adds the Cupertino Icons font to your application. diff --git a/packages/wyatt_authentication_bloc/example_router/pubspec.yaml b/packages/wyatt_authentication_bloc/example_router/pubspec.yaml index e1d13fea..5f6dec50 100644 --- a/packages/wyatt_authentication_bloc/example_router/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example_router/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.5 + ref: wyatt_form_bloc-v0.0.6 path: packages/wyatt_form_bloc # The following adds the Cupertino Icons font to your application. diff --git a/packages/wyatt_authentication_bloc/pubspec.yaml b/packages/wyatt_authentication_bloc/pubspec.yaml index c4b299b6..1204689e 100644 --- a/packages/wyatt_authentication_bloc/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_authentication_bloc description: Authentication BLoC for Flutter repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_authentication_bloc -version: 0.2.1+3 +version: 0.2.1+4 environment: sdk: ">=2.17.0 <3.0.0" @@ -23,7 +23,7 @@ dependencies: wyatt_form_bloc: git: url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages - ref: wyatt_form_bloc-v0.0.5 + ref: wyatt_form_bloc-v0.0.6 path: packages/wyatt_form_bloc diff --git a/packages/wyatt_form_bloc/CHANGELOG.md b/packages/wyatt_form_bloc/CHANGELOG.md index 0b12c175..ff436b66 100644 --- a/packages/wyatt_form_bloc/CHANGELOG.md +++ b/packages/wyatt_form_bloc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.6 + + - **FEAT**: add raw form validator. + ## 0.0.5 - **FEAT**: update deps. diff --git a/packages/wyatt_form_bloc/pubspec.yaml b/packages/wyatt_form_bloc/pubspec.yaml index db0e8c1b..6c53cb7a 100644 --- a/packages/wyatt_form_bloc/pubspec.yaml +++ b/packages/wyatt_form_bloc/pubspec.yaml @@ -1,7 +1,7 @@ name: wyatt_form_bloc description: Manage forms in Dart & Flutter with Bloc repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_form_bloc -version: 0.0.5 +version: 0.0.6 environment: sdk: '>=2.17.2 <3.0.0' From ba4f3a7b4a218f382029147600c9c4ea69ecdbba Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Fri, 26 Aug 2022 14:53:02 +0200 Subject: [PATCH 12/12] fix(auth): fix bug on hot refresh --- .../cubit/authentication_cubit.dart | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart index f773ab48..95ae5a59 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart @@ -45,18 +45,20 @@ class AuthenticationCubit extends Cubit> { _authenticationRepository.cubitStatus.last; void _subscribeStatus() { - _statusSubscription = _authenticationRepository.cubitStatus.listen( - (status) { - switch (status) { - case AuthCubitStatus.started: - start(); - break; - case AuthCubitStatus.stoped: - stop(); - break; - } - }, - ); + try { + _statusSubscription = _authenticationRepository.cubitStatus.listen( + (status) { + switch (status) { + case AuthCubitStatus.started: + start(); + break; + case AuthCubitStatus.stoped: + stop(); + break; + } + }, + ); + } catch (_) {} } Future init() async {