From 38fe22903f0651760e2324fa76aea28c8fee0b8e Mon Sep 17 00:00:00 2001
From: Tim Shedor <tshedor@gmail.com>
Date: Sat, 24 Aug 2024 15:43:23 -0700
Subject: [PATCH] remove true definitions

---
 packages/brick_build/lib/src/utils/shared_checker.dart     | 4 ++--
 packages/brick_json_generators/lib/json_deserialize.dart   | 5 ++---
 .../lib/src/offline_first_sqlite_generators.dart           | 6 ++----
 .../lib/src/sqlite_deserialize.dart                        | 7 +++----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/brick_build/lib/src/utils/shared_checker.dart b/packages/brick_build/lib/src/utils/shared_checker.dart
index 841aaa18..c388f0d6 100644
--- a/packages/brick_build/lib/src/utils/shared_checker.dart
+++ b/packages/brick_build/lib/src/utils/shared_checker.dart
@@ -181,9 +181,9 @@ class SharedChecker<_SiblingModel extends Model> {
     if (classElement.supertype?.typeArguments == null ||
         classElement.supertype!.typeArguments.isEmpty) {
       throw InvalidGenerationSourceError(
-        'Type argument for ${targetType.getDisplayString()}${targetType.nullabilitySuffix == NullabilitySuffix.question ? '?' : ''} is undefined.',
+        'Type argument for ${targetType.getDisplayString()} is undefined.',
         todo:
-            'Define the type on class ${targetType.element}, e.g. `extends ${classElement.supertype!.getDisplayString(withNullability: false)}<int>`',
+            'Define the type on class ${targetType.element}, e.g. `extends ${classElement.supertype!.getDisplayString().replaceAll('?', '')}<int>`',
         element: targetType.element,
       );
     }
diff --git a/packages/brick_json_generators/lib/json_deserialize.dart b/packages/brick_json_generators/lib/json_deserialize.dart
index d5677e60..f52b835c 100644
--- a/packages/brick_json_generators/lib/json_deserialize.dart
+++ b/packages/brick_json_generators/lib/json_deserialize.dart
@@ -1,5 +1,4 @@
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:brick_build/generators.dart';
 import 'package:brick_core/core.dart';
 import 'package:brick_core/field_serializable.dart';
@@ -95,7 +94,7 @@ mixin JsonDeserialize<TModel extends Model, Annotation extends FieldSerializable
         final nullableSuffix = checker.isNullable ? '?' : '';
 
         return '''$fieldValue$nullableSuffix.map(
-          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString()}${parameterType.nullabilitySuffix == NullabilitySuffix.question ? '?' : ''})
+          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString()})
         )$castIterable$defaultValue''';
       }
 
@@ -139,7 +138,7 @@ mixin JsonDeserialize<TModel extends Model, Annotation extends FieldSerializable
       final parameterType = checker.fromJsonConstructor!.parameters.first.type;
 
       final output =
-          '${klass.displayName}.fromJson($fieldValue as ${parameterType.getDisplayString()}${parameterType.nullabilitySuffix == NullabilitySuffix.question ? '?' : ''})';
+          '${klass.displayName}.fromJson($fieldValue as ${parameterType.getDisplayString()})';
       if (checker.isNullable) return '$fieldValue != null ? $output : null';
       return output;
     }
diff --git a/packages/brick_offline_first_build/lib/src/offline_first_sqlite_generators.dart b/packages/brick_offline_first_build/lib/src/offline_first_sqlite_generators.dart
index a3b7528c..17f4e257 100644
--- a/packages/brick_offline_first_build/lib/src/offline_first_sqlite_generators.dart
+++ b/packages/brick_offline_first_build/lib/src/offline_first_sqlite_generators.dart
@@ -91,8 +91,7 @@ class OfflineFirstSqliteDeserialize extends SqliteDeserialize {
       if (argTypeChecker.hasSerdes) {
         final doesHaveConstructor = hasConstructor(checker.argType);
         if (doesHaveConstructor) {
-          final serializableType =
-              argTypeChecker.superClassTypeArgs.last.getDisplayString(withNullability: true);
+          final serializableType = argTypeChecker.superClassTypeArgs.last.getDisplayString();
           return '''
             jsonDecode($fieldValue).map(
               (c) => $argType.$constructorName(c as $serializableType)
@@ -106,8 +105,7 @@ class OfflineFirstSqliteDeserialize extends SqliteDeserialize {
     if ((checker as OfflineFirstChecker).hasSerdes) {
       final doesHaveConstructor = hasConstructor(field.type);
       if (doesHaveConstructor) {
-        final serializableType =
-            checker.superClassTypeArgs.last.getDisplayString(withNullability: true);
+        final serializableType = checker.superClassTypeArgs.last.getDisplayString();
         return '${SharedChecker.withoutNullability(field.type)}.$constructorName($fieldValue as $serializableType)';
       }
     }
diff --git a/packages/brick_sqlite_generators/lib/src/sqlite_deserialize.dart b/packages/brick_sqlite_generators/lib/src/sqlite_deserialize.dart
index ee9e2f66..6d66c48f 100644
--- a/packages/brick_sqlite_generators/lib/src/sqlite_deserialize.dart
+++ b/packages/brick_sqlite_generators/lib/src/sqlite_deserialize.dart
@@ -1,5 +1,4 @@
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:brick_build/generators.dart' show SerdesGenerator, SharedChecker;
 import 'package:brick_sqlite/brick_sqlite.dart';
 import 'package:brick_sqlite/db.dart' show InsertTable, InsertForeignKey;
@@ -138,7 +137,7 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
         final discoveredByIndex =
             'jsonDecode($fieldValue).map((d) => d as int > -1 ? ${SharedChecker.withoutNullability(argType)}.values[d] : null)';
         final nullableSuffix = checker.isNullable ? '?' : '';
-        return '$discoveredByIndex$nullableSuffix.whereType<${argType.getDisplayString()}${argType.nullabilitySuffix == NullabilitySuffix.question ? '?' : ''}>()$castIterable';
+        return '$discoveredByIndex$nullableSuffix.whereType<${argType.getDisplayString()}>()$castIterable';
       }
 
       // Iterable<bool>
@@ -153,7 +152,7 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
         final nullableSuffix = checker.isNullable ? " ?? '[]'" : '';
 
         return '''jsonDecode($fieldValue$nullableSuffix).map(
-          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString()}${parameterType.nullabilitySuffix == NullabilitySuffix.question ? '?' : ''})
+          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString()})
         )$castIterable$defaultValue''';
       }
 
@@ -211,7 +210,7 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
     } else if (checker.fromJsonConstructor != null) {
       final klass = checker.targetType.element as ClassElement;
       final parameterType = checker.fromJsonConstructor!.parameters.first.type;
-      return '${klass.displayName}.fromJson(jsonDecode($fieldValue as String) as ${parameterType.getDisplayString()}${parameterType.nullabilitySuffix == NullabilitySuffix.question ? '?' : ''})';
+      return '${klass.displayName}.fromJson(jsonDecode($fieldValue as String) as ${parameterType.getDisplayString()})';
     }
 
     return null;