fix: correct handling of the DATE attribute (#6)

* Upgrade dependencies, fix lint issues

* more lints

* Fix handling of DATE attribute, remove redundant getters

Author: romanbsd

analysis_options.yaml

@@ -1 +1,6 @@
-include: package:pedantic/analysis_options.yaml
+include: package:very_good_analysis/analysis_options.yaml
+linter:
+  rules:
+    flutter_style_todos: false
+    lines_longer_than_80_chars: false
+    public_member_api_docs: false

example/main.dart

@@ -31,6 +31,7 @@ const testData = '''
 void main() {
   final parser = GedcomParser();
   final root = parser.parse(testData);
+  // ignore: avoid_print
   print(root.toGedcomString(recursive: true));
   //Output:
 

lib/gedcom.dart

@@ -25,7 +25,6 @@
 // along with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-library gedcom;
 
-export 'src/gedcom.dart';
 export 'src/element/element.dart';
+export 'src/gedcom.dart';

lib/src/element/birth.dart

@@ -4,25 +4,16 @@ part of 'element.dart';
 class BirthElement extends GedcomElement {
   /// Constructor of the FileElement
   BirthElement({
-    required int level,
-    String? pointer,
-    String? value,
-    List<GedcomElement>? children,
-    GedcomElement? parent,
-    String? crlf = '\n',
+    required super.level,
+    super.pointer,
+    super.value,
+    super.children,
+    super.parent,
+    super.crlf,
   }) : super(
-          level: level,
           tag: GEDCOM_TAG_BIRTH,
-          pointer: pointer,
-          value: value,
-          children: children,
-          parent: parent,
-          crlf: crlf,
         );
 
-  @override
-  String get tag => GEDCOM_TAG_BIRTH;
-
   DateTime? get date => children.any((e) => e is DateElement)
       ? (children.firstWhere((e) => e is DateElement) as DateElement).date
       : null;

lib/src/element/date.dart

@@ -4,25 +4,16 @@ part of 'element.dart';
 class DateElement extends GedcomElement {
   /// Constructor of the FileElement
   DateElement({
-    required int level,
-    String? pointer,
-    String? value,
-    List<GedcomElement>? children,
-    GedcomElement? parent,
-    String? crlf = '\n',
+    required super.level,
+    super.pointer,
+    super.value,
+    super.children,
+    super.parent,
+    super.crlf,
   }) : super(
-          level: level,
-          tag: GEDCOM_TAG_BIRTH,
-          pointer: pointer,
-          value: value,
-          children: children,
-          parent: parent,
-          crlf: crlf,
+          tag: GEDCOM_TAG_DATE,
         );
 
-  @override
-  String get tag => GEDCOM_TAG_BIRTH;
-
   DateTime? get date => _parseDate();
 
   DateTime? _parseDate() {

lib/src/element/death.dart

@@ -4,25 +4,16 @@ part of 'element.dart';
 class DeathElement extends GedcomElement {
   /// Constructor of the FileElement
   DeathElement({
-    required int level,
-    String? pointer,
-    String? value,
-    List<GedcomElement>? children,
-    GedcomElement? parent,
-    String? crlf = '\n',
+    required super.level,
+    super.pointer,
+    super.value,
+    super.children,
+    super.parent,
+    super.crlf,
   }) : super(
-          level: level,
           tag: GEDCOM_TAG_DEATH,
-          pointer: pointer,
-          value: value,
-          children: children,
-          parent: parent,
-          crlf: crlf,
         );
 
-  @override
-  String get tag => GEDCOM_TAG_DEATH;
-
   DateTime? get date => children.any((e) => e is DateElement)
       ? (children.firstWhere((e) => e is DateElement) as DateElement).date
       : null;

lib/src/element/element.dart

@@ -28,7 +28,7 @@
 import 'dart:convert';
 
 import 'package:collection/collection.dart'
-    show IterableExtension, DeepCollectionEquality;
+    show DeepCollectionEquality, IterableExtension;
 import 'package:meta/meta.dart';
 
 part 'birth.dart';
@@ -79,6 +79,29 @@ class GedcomElement {
     this.crlf = '\n',
   }) : _children = children ?? [];
 
+  /// Creates element from map
+  factory GedcomElement.fromMap(Map<String, dynamic>? map) {
+    if (map == null) return GedcomElement.empty;
+
+    return GedcomElement(
+      level: map['level'] as int,
+      pointer: map['pointer'] as String?,
+      tag: map['tag'] as String,
+      value: map['value'] as String?,
+      children: List<GedcomElement>.from(
+        (map['children'] as List<Map<String, dynamic>>?)
+                ?.map(GedcomElement.fromMap) ??
+            [],
+      ),
+      parent: GedcomElement.fromMap(map['parent'] as Map<String, dynamic>?),
+      crlf: map['crlf'] as String?,
+    );
+  }
+
+  /// Creates element from JSON
+  factory GedcomElement.fromJson(String source) =>
+      GedcomElement.fromMap(json.decode(source) as Map<String, dynamic>);
+
   /// Level of the element within the GEDCOM file
   final int level;
 
@@ -112,8 +135,8 @@ class GedcomElement {
   String? get multiLineValue {
     var result = value ?? '';
     var lastCrlf = crlf;
-    for (var element in children) {
-      var tag = element.tag;
+    for (final element in children) {
+      final tag = element.tag;
       if (tag == GEDCOM_TAG_CONCATENATION) {
         result += element.value!;
         lastCrlf = element.crlf;
@@ -211,31 +234,31 @@ class GedcomElement {
   /// Formats this element and optionally all of its subelements
   /// to GEDCOM string
   String toGedcomString({bool recursive = false}) {
-    var result = '$level';
+    final buffer = StringBuffer();
 
-    if (pointer != null && pointer!.isNotEmpty) {
-      result += ' $pointer';
-    }
+    if (level >= 0) {
+      buffer.write('$level');
 
-    result += ' $tag';
+      if (pointer != null && pointer!.isNotEmpty) {
+        buffer.write(' $pointer');
+      }
 
-    if (value != null && value!.isNotEmpty) {
-      result += ' $value';
-    }
+      buffer.write(' $tag');
 
-    result += crlf!;
+      if (value != null && value!.isNotEmpty) {
+        buffer.write(' $value');
+      }
 
-    if (level < 0) {
-      result = '';
+      buffer.write(crlf);
     }
 
-    if (recursive == true) {
+    if (recursive) {
       for (final element in children) {
-        result += element.toGedcomString(recursive: true);
+        buffer.write(element.toGedcomString(recursive: true));
       }
     }
 
-    return result;
+    return buffer.toString();
   }
 
   /// Returns copy of the element
@@ -274,45 +297,25 @@ class GedcomElement {
 
   static final empty = GedcomElement(level: -1, tag: '');
 
-  /// Creates element from map
-  factory GedcomElement.fromMap(Map<String, dynamic>? map) {
-    if (map == null) return GedcomElement.empty;
-
-    return GedcomElement(
-      level: map['level'],
-      pointer: map['pointer'],
-      tag: map['tag'],
-      value: map['value'],
-      children: List<GedcomElement>.from(
-          map['children']?.map((x) => GedcomElement.fromMap(x))),
-      parent: GedcomElement.fromMap(map['parent']),
-      crlf: map['crlf'],
-    );
-  }
-
   /// Returns JSON representation of the elmenet
   String toJson() => json.encode(toMap());
 
-  /// Creates element from JSON
-  factory GedcomElement.fromJson(String source) =>
-      GedcomElement.fromMap(json.decode(source));
-
   @override
   String toString() => toGedcomString();
 
   @override
-  bool operator ==(Object o) {
-    if (identical(this, o)) return true;
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return o is GedcomElement &&
-        o.level == level &&
-        o.pointer == pointer &&
-        o.tag == tag &&
-        o.value == value &&
-        listEquals(o.children, children) &&
-        o.parent == parent &&
-        o.crlf == crlf;
+    return other is GedcomElement &&
+        other.level == level &&
+        other.pointer == pointer &&
+        other.tag == tag &&
+        other.value == value &&
+        listEquals(other.children, children) &&
+        other.parent == parent &&
+        other.crlf == crlf;
   }
 
   @override

lib/src/element/family.dart

@@ -4,25 +4,16 @@ part of 'element.dart';
 class FamilyElement extends GedcomElement {
   /// Constructor of the FamilyElement
   FamilyElement({
-    required int level,
-    String? pointer,
-    String? value,
-    List<GedcomElement>? children,
-    GedcomElement? parent,
-    String? crlf = '\n',
+    required super.level,
+    super.pointer,
+    super.value,
+    super.children,
+    super.parent,
+    super.crlf,
   }) : super(
-          level: level,
           tag: GEDCOM_TAG_FAMILY,
-          pointer: pointer,
-          value: value,
-          children: children,
-          parent: parent,
-          crlf: crlf,
         );
 
-  @override
-  String get tag => GEDCOM_TAG_FAMILY;
-
   /// Returns the husband/father of the family
   ///
   /// Returns null if not found

lib/src/element/file.dart

@@ -4,25 +4,16 @@ part of 'element.dart';
 class FileElement extends GedcomElement {
   /// Constructor of the FileElement
   FileElement({
-    required int level,
-    String? pointer,
-    String? value,
-    List<GedcomElement>? children,
-    GedcomElement? parent,
-    String? crlf = '\n',
+    required super.level,
+    super.pointer,
+    super.value,
+    super.children,
+    super.parent,
+    super.crlf,
   }) : super(
-          level: level,
           tag: GEDCOM_TAG_FILE,
-          pointer: pointer,
-          value: value,
-          children: children,
-          parent: parent,
-          crlf: crlf,
         );
 
-  @override
-  String get tag => GEDCOM_TAG_FILE;
-
   /// Returns copy of the element
   @override
   FileElement copyWith({

lib/src/element/individual.dart

@@ -5,25 +5,16 @@ class IndividualElement extends GedcomElement
     implements Comparable<IndividualElement> {
   /// Constructor of the FileElement
   IndividualElement({
-    required int level,
-    String? pointer,
-    String? value,
-    List<GedcomElement>? children,
-    GedcomElement? parent,
-    String? crlf = '\n',
+    required super.level,
+    super.pointer,
+    super.value,
+    super.children,
+    super.parent,
+    super.crlf,
   }) : super(
-          level: level,
           tag: GEDCOM_TAG_INDIVIDUAL,
-          pointer: pointer,
-          value: value,
-          children: children,
-          parent: parent,
-          crlf: crlf,
         );
 
-  @override
-  String get tag => GEDCOM_TAG_INDIVIDUAL;
-
   /// Checks if this individual is deceased
   bool get isDeceased =>
       children.any((element) => element.tag == GEDCOM_TAG_DEATH);
@@ -46,7 +37,8 @@ class IndividualElement extends GedcomElement
 
   /// Checks if this individual is marked private
   bool get isPrivate => children.any(
-      (element) => element.tag == GEDCOM_TAG_PRIVATE && element.value == 'Y');
+        (element) => element.tag == GEDCOM_TAG_PRIVATE && element.value == 'Y',
+      );
 
   /// Returns individual's birth date. Returns null if not available.
   DateTime? get birthDate => children.any((e) => e is BirthElement)
@@ -97,10 +89,7 @@ class IndividualElement extends GedcomElement
       }
     }
     // If we reach here we are probably returning empty strings
-    return Name(
-      givenName: '',
-      surname: '',
-    );
+    return Name.empty;
   }
 
   /// Returns copy of the element