fix: Corrected Enum determination.

mathrunet · Aug 9, 2023 · 64eff68 · 64eff68
1 parent eaa17f4
commit 64eff68
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/packages/masamune/lib/model/model_query_selector.dart b/packages/masamune/lib/model/model_query_selector.dart
@@ -164,14 +164,18 @@ mixin _ContainsAnyQuerySelectorMixin<T, TQuery extends ModelQueryBase>
   /// Only elements whose array for [key] contains one of the values in [values] can be filtered.
   ///
   /// [key]に対する配列に[values]の値のいずれかが含まれる要素のみをフィルタリングすることができます。
-  TQuery containsAny(List<T>? values) {
+  TQuery containsAny(List<T?>? values) {
     if (values == null) {
       return _toQuery(_modelQuery);
     }
     return _toQuery(
       _modelQuery.containsAny(
         key,
-        values.where((e) => e != null).map((e) => e as Object).toList(),
+        values
+            .where((e) => e != null)
+            .cast<T>()
+            .map((e) => e as Object)
+            .toList(),
       ),
     );
   }
@@ -182,14 +186,18 @@ mixin _WhereQuerySelectorMixin<T, TQuery extends ModelQueryBase>
   /// You can filter only those elements in the [values] array that contain one of the values for [key].
   ///
   /// [values]の配列に[key]に対する値のいずれかが含まれる要素のみをフィルタリングすることができます。
-  TQuery where(List<T>? values) {
+  TQuery where(List<T?>? values) {
     if (values == null) {
       return _toQuery(_modelQuery);
     }
     return _toQuery(
       _modelQuery.where(
         key,
-        values.where((e) => e != null).map((e) => e as Object).toList(),
+        values
+            .where((e) => e != null)
+            .cast<T>()
+            .map((e) => e as Object)
+            .toList(),
       ),
     );
   }
@@ -200,14 +208,18 @@ mixin _NotWhereQuerySelectorMixin<T, TQuery extends ModelQueryBase>
   /// You can filter only those elements in the [values] array that do not contain any of the values for [key].
   ///
   /// [values]の配列に[key]に対する値のいずれも含まれない要素のみをフィルタリングすることができます。
-  TQuery notWhere(List<T>? values) {
+  TQuery notWhere(List<T?>? values) {
     if (values == null) {
       return _toQuery(_modelQuery);
     }
     return _toQuery(
       _modelQuery.notWhere(
         key,
-        values.where((e) => e != null).map((e) => e as Object).toList(),
+        values
+            .where((e) => e != null)
+            .cast<T>()
+            .map((e) => e as Object)
+            .toList(),
       ),
     );
   }

diff --git a/packages/masamune/pubspec.lock b/packages/masamune/pubspec.lock
@@ -331,14 +331,14 @@ packages:
       path: "../katana_router"
       relative: true
     source: path
-    version: "2.0.26"
+    version: "2.0.27"
   katana_router_annotation:
     dependency: "direct overridden"
     description:
       path: "../katana_router_annotation"
       relative: true
     source: path
-    version: "2.0.15"
+    version: "2.0.16"
   katana_scoped:
     dependency: "direct main"
     description:

diff --git a/packages/masamune_builder/lib/model/collection_model_query_class.dart b/packages/masamune_builder/lib/model/collection_model_query_class.dart
@@ -7,7 +7,7 @@ String _querySelectorClass(ParamaterValue param, String queryClass) {
     return "NumModelQuerySelector<$queryClass>";
   } else if (param.type.isDartCoreBool) {
     return "BooleanModelQuerySelector<$queryClass>";
-  } else if (param.type.isDartCoreEnum) {
+  } else if (param.type.isDartCoreEnum || param.type.element is EnumElement) {
     final typeName = param.type.toString().trimStringRight("?");
     return "ValueModelQuerySelector<$typeName, $queryClass>";
   } else if (param.reference.isNotEmpty) {

diff --git a/packages/masamune_builder/pubspec.lock b/packages/masamune_builder/pubspec.lock
@@ -277,7 +277,7 @@ packages:
       path: "../katana_listenables_builder"
       relative: true
     source: path
-    version: "2.0.15"
+    version: "2.0.16"
   katana_localization_annotation:
     dependency: "direct main"
     description:
@@ -291,7 +291,7 @@ packages:
       path: "../katana_localization_builder"
       relative: true
     source: path
-    version: "2.0.17"
+    version: "2.0.18"
   katana_prefs_annotation:
     dependency: "direct main"
     description:
@@ -305,21 +305,21 @@ packages:
       path: "../katana_prefs_builder"
       relative: true
     source: path
-    version: "2.0.15"
+    version: "2.0.16"
   katana_router_annotation:
     dependency: "direct main"
     description:
       path: "../katana_router_annotation"
       relative: true
     source: path
-    version: "2.0.15"
+    version: "2.0.16"
   katana_router_builder:
     dependency: "direct main"
     description:
       path: "../katana_router_builder"
       relative: true
     source: path
-    version: "2.0.21"
+    version: "2.0.23"
   katana_theme_annotation:
     dependency: "direct main"
     description:
@@ -333,7 +333,7 @@ packages:
       path: "../katana_theme_builder"
       relative: true
     source: path
-    version: "2.0.15"
+    version: "2.0.16"
   lints:
     dependency: transitive
     description: