fixed withNullability deprecation

peiffer-innovations · Jan 22, 2025 · 886972f · 886972f
1 parent 16b622e
commit 886972f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/packages/codegen/lib/json_dynamic_widget_codegen.dart b/packages/codegen/lib/json_dynamic_widget_codegen.dart
@@ -8,4 +8,6 @@ export 'src/builder/json_widget_registrar_builder.dart';
 export 'src/decoder/decoders.dart';
 export 'src/decoder/schema_decoders.dart';
 //
+export 'src/extension/dart_type_extension.dart';
+//
 export 'src/util/widget_metadata.dart';
diff --git a/packages/codegen/lib/src/decoder/decoders.dart b/packages/codegen/lib/src/decoder/decoders.dart
@@ -1,6 +1,5 @@
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/type.dart';
+import 'package:json_dynamic_widget_codegen/src/extension/dart_type_extension.dart';
 import 'package:json_theme/codegen.dart';
 
 typedef ParameterDecoder = String Function(
@@ -219,8 +218,7 @@ String decode(
   if (defaultValueCode != null) {
     if (defaultValueCode == 'null') {
       defaultValueCode = null;
-    } else if (element.type.getDisplayString(withNullability: false) ==
-        'double') {
+    } else if (element.type.toNonNullableString() == 'double') {
       if (int.tryParse(defaultValueCode) != null) {
         defaultValueCode = '$defaultValueCode.0';
       }
@@ -229,7 +227,7 @@ String decode(
   var result =
       "map['$name']${defaultValueCode == null ? '' : '?? $defaultValueCode'}";
 
-  final typeStr = element.type.getDisplayString(withNullability: false);
+  final typeStr = element.type.toNonNullableString();
 
   var decoded = false;
   if (paramDecoders.contains(name)) {
@@ -312,7 +310,3 @@ String _widgetDecoder(
   return parsed;
 }()
 ''';
-
-extension DartTypeNullable on DartType {
-  bool get nullable => nullabilitySuffix == NullabilitySuffix.question;
-}
diff --git a/packages/codegen/lib/src/encoder/encoders.dart b/packages/codegen/lib/src/encoder/encoders.dart
@@ -1,6 +1,5 @@
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/type.dart';
+import 'package:json_dynamic_widget_codegen/json_dynamic_widget_codegen.dart';
 import 'package:json_theme/codegen.dart';
 
 typedef ParameterEncoder = String Function(
@@ -90,7 +89,7 @@ String encode(
   final displayName = element.name;
   final name = aliases[element.name] ?? element.name;
 
-  final typeStr = element.type.getDisplayString(withNullability: false);
+  final typeStr = element.type.toNonNullableString();
 
   final encoder = kEncoders[typeStr];
   var result = displayName;
@@ -111,7 +110,3 @@ String encode(
   '${element.name}': ${defaultValueCode == null ? result : '$defaultValueCode == $displayName ? null : $result'},
 ''';
 }
-
-extension DartTypeNullable on DartType {
-  bool get nullable => nullabilitySuffix == NullabilitySuffix.question;
-}
diff --git a/packages/codegen/lib/src/extension/dart_type_extension.dart b/packages/codegen/lib/src/extension/dart_type_extension.dart
@@ -0,0 +1,16 @@
+import 'package:analyzer/dart/element/nullability_suffix.dart';
+import 'package:analyzer/dart/element/type.dart';
+
+extension DartTypeNullability on DartType {
+  bool get nullable => nullabilitySuffix == NullabilitySuffix.question;
+
+  String toNonNullableString() {
+    var result = getDisplayString();
+
+    if (nullabilitySuffix == NullabilitySuffix.question) {
+      result = result.substring(0, result.length - 1);
+    }
+
+    return result;
+  }
+}