Merge branch 'master' into pub

.tools/cpex

@@ -14,6 +14,10 @@ cp example/bin/sealed/nullsafe/data/simple/common.dart sealed_annotations/exampl
 cp example/bin/sealed/nullsafe/data/simple/common.sealed.dart sealed_annotations/example/
 cp example/bin/sealed/nullsafe/data/generic/result_complex.dart sealed_annotations/example/
 cp example/bin/sealed/nullsafe/data/generic/result_complex.sealed.dart sealed_annotations/example/
+cp example/bin/sealed/nullsafe/data/simple/hierarchy.dart sealed_annotations/example/
+cp example/bin/sealed/nullsafe/data/simple/hierarchy.sealed.dart sealed_annotations/example/
+cp example/bin/sealed/nullsafe/data/generic/result_hierarchy.dart sealed_annotations/example/
+cp example/bin/sealed/nullsafe/data/generic/result_hierarchy.sealed.dart sealed_annotations/example/
 
 cp example/bin/sealed/nullsafe/data/simple/weather.dart sealed_generators/example/
 cp example/bin/sealed/nullsafe/data/simple/weather.sealed.dart sealed_generators/example/
@@ -27,5 +31,9 @@ cp example/bin/sealed/nullsafe/data/simple/common.dart sealed_generators/example
 cp example/bin/sealed/nullsafe/data/simple/common.sealed.dart sealed_generators/example/
 cp example/bin/sealed/nullsafe/data/generic/result_complex.dart sealed_generators/example/
 cp example/bin/sealed/nullsafe/data/generic/result_complex.sealed.dart sealed_generators/example/
+cp example/bin/sealed/nullsafe/data/simple/hierarchy.dart sealed_generators/example/
+cp example/bin/sealed/nullsafe/data/simple/hierarchy.sealed.dart sealed_generators/example/
+cp example/bin/sealed/nullsafe/data/generic/result_hierarchy.dart sealed_generators/example/
+cp example/bin/sealed/nullsafe/data/generic/result_hierarchy.sealed.dart sealed_generators/example/
 
 echo DONE

.tools/cpex.bat

@@ -14,6 +14,10 @@ copy example\bin\sealed\nullsafe\data\simple\common.dart sealed_annotations\exam
 copy example\bin\sealed\nullsafe\data\simple\common.sealed.dart sealed_annotations\example\
 copy example\bin\sealed\nullsafe\data\generic\result_complex.dart sealed_annotations\example\
 copy example\bin\sealed\nullsafe\data\generic\result_complex.sealed.dart sealed_annotations\example\
+copy example\bin\sealed\nullsafe\data\simple\hierarchy.dart sealed_annotations\example\
+copy example\bin\sealed\nullsafe\data\simple\hierarchy.sealed.dart sealed_annotations\example\
+copy example\bin\sealed\nullsafe\data\generic\result_hierarchy.dart sealed_annotations\example\
+copy example\bin\sealed\nullsafe\data\generic\result_hierarchy.sealed.dart sealed_annotations\example\
 
 copy example\bin\sealed\nullsafe\data\simple\weather.dart sealed_generators\example\
 copy example\bin\sealed\nullsafe\data\simple\weather.sealed.dart sealed_generators\example\
@@ -27,5 +31,9 @@ copy example\bin\sealed\nullsafe\data\simple\common.dart sealed_generators\examp
 copy example\bin\sealed\nullsafe\data\simple\common.sealed.dart sealed_generators\example\
 copy example\bin\sealed\nullsafe\data\generic\result_complex.dart sealed_generators\example\
 copy example\bin\sealed\nullsafe\data\generic\result_complex.sealed.dart sealed_generators\example\
+copy example\bin\sealed\nullsafe\data\simple\hierarchy.dart sealed_generators\example\
+copy example\bin\sealed\nullsafe\data\simple\hierarchy.sealed.dart sealed_generators\example\
+copy example\bin\sealed\nullsafe\data\generic\result_hierarchy.dart sealed_generators\example\
+copy example\bin\sealed\nullsafe\data\generic\result_hierarchy.sealed.dart sealed_generators\example\
 
 echo DONE

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.12.0
+
+- Added hierarchy feature to use sealed classes directly in sealed hierarchies
+
 ## 1.11.0
 
 - Added whenOrNull and mapOrNull methods (#12)

README.md

@@ -321,6 +321,52 @@ abstract class _WeatherInfo {
 }
 ```
 
+### Hierarchy Feature
+
+If Sealed classes are in the same file you can reference them directly using their manifest class name. This is to
+avoid `@WithType` annotation and better refactoring capability.
+
+```dart
+@Sealed()
+abstract class _Apple {
+  void eat();
+}
+
+@Sealed()
+abstract class _Banana {
+  void eat();
+}
+
+@Sealed()
+abstract class _Basket {
+  void friends(_Apple? apple, _Banana? banana);
+
+// or equivalently
+// void friends(@WithType('Apple?') apple, @WithType('Banana?') banana);
+}
+```
+
+And for generic case:
+
+```dart
+@Sealed()
+abstract class _Result<D extends num> {
+  void success(D data);
+
+  void error(Object exception);
+}
+
+@Sealed()
+abstract class _Basket {
+  void hold(_Result<int> x);
+
+// or equivalently:
+// void hold(@WithType('Result<int>') x);
+}
+```
+
+`@WithType` annotation will override hierarchy feature if present.
+
 ## Common Fields
 
 Sometimes you need some fields to be present in all of your sealed classes. For example consider making a sealed class

example/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.12.0
+
+- Added hierarchy feature to use sealed classes directly in sealed hierarchies
+
 ## 1.11.0
 
 - Added whenOrNull and mapOrNull methods (#12)

example/README.md

@@ -321,6 +321,52 @@ abstract class _WeatherInfo {
 }
 ```
 
+### Hierarchy Feature
+
+If Sealed classes are in the same file you can reference them directly using their manifest class name. This is to
+avoid `@WithType` annotation and better refactoring capability.
+
+```dart
+@Sealed()
+abstract class _Apple {
+  void eat();
+}
+
+@Sealed()
+abstract class _Banana {
+  void eat();
+}
+
+@Sealed()
+abstract class _Basket {
+  void friends(_Apple? apple, _Banana? banana);
+
+// or equivalently
+// void friends(@WithType('Apple?') apple, @WithType('Banana?') banana);
+}
+```
+
+And for generic case:
+
+```dart
+@Sealed()
+abstract class _Result<D extends num> {
+  void success(D data);
+
+  void error(Object exception);
+}
+
+@Sealed()
+abstract class _Basket {
+  void hold(_Result<int> x);
+
+// or equivalently:
+// void hold(@WithType('Result<int>') x);
+}
+```
+
+`@WithType` annotation will override hierarchy feature if present.
+
 ## Common Fields
 
 Sometimes you need some fields to be present in all of your sealed classes. For example consider making a sealed class

example/bin/sealed/nullsafe/data/generic/result_hierarchy.dart

@@ -0,0 +1,18 @@
+import 'package:sealed_annotations/sealed_annotations.dart';
+
+part 'result_hierarchy.sealed.dart';
+
+@Sealed()
+abstract class _Result<D extends num> {
+  void success(D data);
+
+  void error(Object exception);
+}
+
+@Sealed()
+abstract class _Basket {
+  void hold(
+    _Result<int> x,
+    _Result<double>? y,
+  );
+}