+Critical bugfix

Author: t0mb3rr

README.md

@@ -49,3 +49,4 @@ If you're enjoying this package and find it valuable, consider showing your appr
 ## License
 
 This project is released under the [MIT License](https://raw.githubusercontent.com/dev-cetera/df_generate_dart_models_core/main/LICENSE). See [LICENSE](https://raw.githubusercontent.com/dev-cetera/df_generate_dart_models_core/main/LICENSE) for more information.
+

lib/src/_utils/dart_from_record_on_dart_object_x.dart

@@ -32,9 +32,7 @@ extension type DartFromRecordOnDartObjectX(_DartObject dartObj) {
   /// Returns `fieldName` property from [dartObj] if it matches the structure of
   /// [TFieldRecord] or `null`.
   List<String>? fieldPathFromRecord() {
-    return _rawFieldPathFromRecord()
-        ?.map((e) => e.replaceAll('?', ''))
-        .toList();
+    return _rawFieldPathFromRecord()?.map((e) => e.replaceAll('?', '')).toList();
   }
 
   List<String>? _rawFieldPathFromRecord() {
@@ -50,24 +48,20 @@ extension type DartFromRecordOnDartObjectX(_DartObject dartObj) {
   String? fieldTypeFromRecord() {
     final raw = _rawFieldTypeFromRecord();
     if (raw != null) {
-      return raw.endsWith('?') ? raw.substring(0, raw.length - 1) : raw;
+      return raw.endsWith('?') || raw.endsWith('*') ? raw.substring(0, raw.length - 1) : raw;
     }
     return null;
   }
 
   String? _rawFieldTypeFromRecord() {
     final a = dartObj.getField('\$2')?.toStringValue() as String?;
     final b =
-        dartObj.getField('\$2')?.toTypeValue()?.getDisplayString() as String?;
-    final c =
-        dartObj.getField(FieldModelFieldNames.fieldType)?.toStringValue()
-            as String?;
-    final d =
-        dartObj
-                .getField(FieldModelFieldNames.fieldType)
-                ?.toTypeValue()
-                ?.getDisplayString()
-            as String?;
+        dartObj.getField('\$2')?.toTypeValue()?.getDisplayString(withNullability: true) as String?;
+    final c = dartObj.getField(FieldModelFieldNames.fieldType)?.toStringValue() as String?;
+    final d = dartObj
+        .getField(FieldModelFieldNames.fieldType)
+        ?.toTypeValue()
+        ?.getDisplayString(withNullability: true) as String?;
     return a ?? b ?? c ?? d;
   }
 
@@ -78,8 +72,7 @@ extension type DartFromRecordOnDartObjectX(_DartObject dartObj) {
       return false;
     }
 
-    final a =
-        dartObj.getField(FieldModelFieldNames.nullable)?.toBoolValue() as bool?;
+    final a = dartObj.getField(FieldModelFieldNames.nullable)?.toBoolValue() as bool?;
     final b = dartObj.getField('\$3')?.toBoolValue() as bool?;
     final c = _rawFieldPathFromRecord()?.any((e) => e.contains('?'));
     final d = _rawFieldTypeFromRecord()?.endsWith('?');
@@ -89,32 +82,25 @@ extension type DartFromRecordOnDartObjectX(_DartObject dartObj) {
   /// Returns the `children` property from [dartObj] if it matches the structure of
   /// [TFieldRecord] or `null`.
   List<Map<String, dynamic>>? childrenFromRecord() {
-    final a =
-        dartObj
-                .getField(FieldModelFieldNames.children)
-                ?.toListValue()
-                ?.map(
-                  (e) => e.toMapValue()!.map(
-                    (k, v) => MapEntry(k!.toStringValue()!, dartObjToObject(v)),
-                  ),
-                )
-            as Iterable?;
+    final a = dartObj.getField(FieldModelFieldNames.children)?.toListValue()?.map(
+          (e) => e.toMapValue()!.map(
+                (k, v) => MapEntry(k!.toStringValue()!, dartObjToObject(v)),
+              ),
+        ) as Iterable?;
     final b = a?.map((e) => (e as Map).cast<String, dynamic>()).toList();
     return b;
   }
 
   /// Returns the `primaryKey` property from [dartObj] if it matches the structure
   /// of [TFieldRecord] or `null`.
   bool? primaryKeyFromRecord() {
-    return dartObj.getField(FieldModelFieldNames.primaryKey)?.toBoolValue()
-        as bool?;
+    return dartObj.getField(FieldModelFieldNames.primaryKey)?.toBoolValue() as bool?;
   }
 
   /// Returns the `foreignKey` property from [dartObj] if it matches the
   /// structure of [TFieldRecord] or `null`.
   bool? foreignKeyFromRecord() {
-    return dartObj.getField(FieldModelFieldNames.foreignKey)?.toBoolValue()
-        as bool?;
+    return dartObj.getField(FieldModelFieldNames.foreignKey)?.toBoolValue() as bool?;
   }
 
   /// Retrieves the `fallback` property from this `DartObject` if it matches
@@ -127,7 +113,6 @@ extension type DartFromRecordOnDartObjectX(_DartObject dartObj) {
   /// Returns the `description` property from [dartObj] record if it matches the
   /// structure of [TFieldRecord] or `null`.
   String? descriptionFromRecord() {
-    return dartObj.getField(FieldModelFieldNames.description)?.toStringValue()
-        as String?;
+    return dartObj.getField(FieldModelFieldNames.description)?.toStringValue() as String?;
   }
 }

lib/src/_utils/dart_obj_to_string_list.dart

@@ -17,13 +17,11 @@ List<String>? dartObjToStringList(dynamic dartObj) {
   if (a != null) {
     return [a];
   }
-  final b =
-      dartObj
-              ?.toListValue()
-              ?.map((e) => e.toStringValue())
-              .where((e) => e != null)
-              .map((e) => e!)
-          as Iterable?;
+  final b = dartObj
+      ?.toListValue()
+      ?.map((e) => e.toStringValue())
+      .where((e) => e != null)
+      .map((e) => e!) as Iterable?;
 
   final c = b?.map((e) => e.toString()).toList();
   return c;

pubspec.yaml

@@ -16,7 +16,7 @@ repository: https://github.com/robmllze/df_generate_dart_models_core
 funding:
   - https://www.buymeacoffee.com/dev_cetera
 description: A package that provides core dependencies for models generated with df_generate_dart_models.
-version: 0.9.18
+version: 0.9.19
 topics:
   - build-runner
   - cli
@@ -35,7 +35,7 @@ dependencies:
   df_collection: ^0.9.3
   df_string: ^0.2.5
   df_type: ^0.12.3
-  df_gen_core: ^0.6.12
+  df_gen_core: ^0.6.13
   equatable: ^2.0.7
 
 ## -----------------------------------------------------------------------------