feat: add is self closing (#4)

tnc1997 · Jan 2, 2021 · 9956218 · 9956218
1 parent baed31f
commit 9956218
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 3 deletions.
diff --git a/xml_annotation/lib/src/annotations/xml_element.dart b/xml_annotation/lib/src/annotations/xml_element.dart
@@ -1,9 +1,11 @@
 class XmlElement {
   final String? name;
   final String? namespace;
+  final bool isSelfClosing;
 
   const XmlElement({
     this.name,
     this.namespace,
+    this.isSelfClosing = true,
   });
 }
diff --git a/xml_annotation/lib/src/annotations/xml_root_element.dart b/xml_annotation/lib/src/annotations/xml_root_element.dart
@@ -1,9 +1,11 @@
 class XmlRootElement {
   final String? name;
   final String? namespace;
+  final bool isSelfClosing;
 
   const XmlRootElement({
     this.name,
     this.namespace,
+    this.isSelfClosing = true,
   });
 }
diff --git a/xml_serializable/example/xml_serializable_example.dart b/xml_serializable/example/xml_serializable_example.dart
@@ -11,12 +11,12 @@ void main() {
         <title lang="english">XML Pocket Reference</title>
         <author>Simon St. Laurent</author>
         <author>Michael James Fitzgerald</author>
-        <price>6.63</price>
+        <price></price>
       </book>
       <book>
         <title lang="english">HTML and XHTML Pocket Reference</title>
         <author>Jennifer Niederst Robbins</author>
-        <price>7.09</price>
+        <price></price>
       </book>
       <price/>
     </bookshelf>''',
@@ -38,7 +38,7 @@ class Book {
   @annotation.XmlElement(name: 'author')
   List<String>? authors;
 
-  @annotation.XmlElement(name: 'price')
+  @annotation.XmlElement(name: 'price', isSelfClosing: false)
   String? price;
 
   Book({

diff --git a/xml_serializable/example/xml_serializable_example.g.dart b/xml_serializable/example/xml_serializable_example.g.dart
diff --git a/xml_serializable/lib/src/generators/xml_serializable_generator.dart b/xml_serializable/lib/src/generators/xml_serializable_generator.dart
@@ -119,6 +119,7 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
 
         final name = annotation.peekStringValue('name') ?? element.name;
         final namespace = annotation.peekStringValue('namespace');
+        final isSelfClosing = annotation.readBoolValue('isSelfClosing');
 
         if (elementTypeElement.hasXmlSerializable) {
           buffer.writeln(
@@ -135,6 +136,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
             );
           }
 
+          buffer.writeln(
+            'isSelfClosing: $isSelfClosing,',
+          );
+
           buffer.writeln(
             'nest: () {',
           );
@@ -173,6 +178,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
             );
           }
 
+          buffer.writeln(
+            'isSelfClosing: $isSelfClosing,',
+          );
+
           buffer.writeln(
             'nest: () {',
           );
@@ -224,6 +233,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
                   );
                 }
 
+                buffer.writeln(
+                  'isSelfClosing: $isSelfClosing,',
+                );
+
                 buffer.writeln(
                   'nest: () {',
                 );
@@ -270,6 +283,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
                   );
                 }
 
+                buffer.writeln(
+                  'isSelfClosing: $isSelfClosing,',
+                );
+
                 buffer.writeln(
                   'nest: () {',
                 );
@@ -645,6 +662,7 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
 
         final name = annotation.peekStringValue('name') ?? element.name;
         final namespace = annotation.peekStringValue('namespace');
+        final isSelfClosing = annotation.readBoolValue('isSelfClosing');
 
         if (elementTypeElement.hasXmlSerializable) {
           buffer.writeln(
@@ -677,6 +695,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
             '[if (${element.name} != null) ...${element.name}.toXmlChildren(namespaces: namespaces,),],',
           );
 
+          buffer.writeln(
+            '$isSelfClosing,',
+          );
+
           buffer.writeln(
             '),',
           );
@@ -711,6 +733,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
             '[if (${element.name} != null) XmlText(${element.name},),],',
           );
 
+          buffer.writeln(
+            '$isSelfClosing,',
+          );
+
           buffer.writeln(
             '),',
           );
@@ -758,6 +784,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
                   'value.toXmlChildren(namespaces: namespaces,),',
                 );
 
+                buffer.writeln(
+                  '$isSelfClosing,',
+                );
+
                 buffer.writeln(
                   '),',
                 );
@@ -800,6 +830,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
                   '[XmlText(value,),],',
                 );
 
+                buffer.writeln(
+                  '$isSelfClosing,',
+                );
+
                 buffer.writeln(
                   '),',
                 );
@@ -835,6 +869,7 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
 
       final name = annotation.peekStringValue('name') ?? element.name;
       final namespace = annotation.peekStringValue('namespace');
+      final isSelfClosing = annotation.readBoolValue('isSelfClosing');
 
       buffer.writeln(
         'return XmlElement(',
@@ -864,6 +899,10 @@ class XmlSerializableGenerator extends GeneratorForAnnotation<XmlSerializable> {
         'instance.toXmlChildren(namespaces: namespaces,),',
       );
 
+      buffer.writeln(
+        '$isSelfClosing,',
+      );
+
       buffer.writeln(
         ');',
       );