added some tests and fixes

Author: benni-tec

packages/tiled/lib/src/common/tiled_image.dart

@@ -18,7 +18,7 @@ part of tiled;
 ///   when the image changes)
 /// * height: The image height in pixels (optional)
 @immutable
-class TiledImage implements Exportable {
+class TiledImage with Exportable {
   final String? source;
   final String? format;
   final int? width;

packages/tiled/lib/src/data.dart

@@ -1,6 +1,6 @@
 part of tiled;
 
-class TileData extends DelegatingList<int> implements Exportable {
+class TileData extends DelegatingList<int> with Exportable {
   TileData(super.base);
 
   @override
@@ -40,33 +40,34 @@ class TileData extends DelegatingList<int> implements Exportable {
   }
 
   String _base64(ExportSettings settings) {
+    // Conversion to Uint8List
+    final uint32 = Uint32List.fromList(this);
+    final dv = ByteData(this.length * 4);
+
+    for (var i = 0; i < this.length; ++i) {
+      dv.setInt32(i * 4, uint32[i], Endian.little);
+    }
+
+    final uint8 = dv.buffer.asUint8List();
+
     // Compression
     List<int> compressed;
+    print(settings.compression);
     switch (settings.compression) {
       case Compression.zlib:
-        compressed = const ZLibEncoder().encode(this);
+        compressed = const ZLibEncoder().encode(uint8);
         break;
       case Compression.gzip:
-        compressed = GZipEncoder().encode(this)!;
+        compressed = GZipEncoder().encode(uint8)!;
         break;
       case Compression.zstd:
         throw UnsupportedError('zstd is an unsupported compression');
       case null:
-        compressed = this;
+        compressed = uint8;
         break;
     }
 
-    // Conversion to Uint8List
-    final uint32 = Uint32List.fromList(compressed);
-    final dv = ByteData(compressed.length * 4);
-
-    for (var i = 0; i < compressed.length; ++i) {
-      dv.setInt32(i * 4, uint32[i], Endian.little);
-    }
-
-    final uint8 = dv.buffer.asUint8List();
-
     // encoding
-    return base64Encode(uint8);
+    return base64Encode(compressed);
   }
 }

packages/tiled/lib/src/exporter/export_element.dart

@@ -24,15 +24,12 @@ class ExportElement implements ExportResolver {
   @override
   XmlElement exportXml() {
     final _children = children.values.expand((e) {
-      switch (e.runtimeType) {
-        case ExportList:
-          return (e as ExportList).map((e) => e.exportXml());
-        case ExportResolver:
-          return [(e as ExportResolver).exportXml()];
-        case ExportValue:
-          return [XmlText((e as ExportValue).xml)];
-        default:
-          throw 'Bad State: ExportChild switch should have been exhaustive';
+      if (e is ExportList) {
+        return e.map((e) => e.exportXml());
+      } else if (e is ExportResolver) {
+        return [e.exportXml()];
+      } else {
+        throw 'Bad State: ExportObject switch should have been exhaustive';
       }
     });
 
@@ -41,11 +38,12 @@ class ExportElement implements ExportResolver {
       fields.entries.map((e) => XmlAttribute(XmlName(e.key), e.value.xml)),
       [
         ..._children,
-        XmlElement(
-          XmlName('properties'),
-          [],
-          properties.map((e) => e.export().exportXml()),
-        ),
+        if (properties.isNotEmpty)
+          XmlElement(
+            XmlName('properties'),
+            [],
+            properties.map((e) => e.export().exportXml()).toList(),
+          ),
       ],
     );
   }
@@ -56,22 +54,18 @@ class ExportElement implements ExportResolver {
           (key, value) => MapEntry<String, dynamic>(key, value.json),
         ),
         ...children.map<String, dynamic>((key, e) {
-          switch (e.runtimeType) {
-            case ExportList:
-              return MapEntry<String, Iterable<dynamic>>(
-                key,
-                (e as ExportList).map<dynamic>((e) => e.exportJson()),
-              );
-            case ExportResolver:
-              return MapEntry<String, dynamic>(
-                key,
-                (e as ExportElement).exportJson(),
-              );
-            default:
-              throw 'Bad State: ExportChild switch should have been exhaustive';
+          if (e is ExportList) {
+            return MapEntry<String, Iterable<dynamic>>(
+              key,
+              e.map<dynamic>((e) => e.exportJson()).toList(),
+            );
+          } else if (e is ExportResolver) {
+            return MapEntry<String, dynamic>(key, e.exportJson());
+          } else {
+            throw 'Bad State: ExportChild switch should have been exhaustive';
           }
         }),
-        'properties': properties.map((e) => e.export().exportJson()),
+        'properties': properties.map((e) => e.export().exportJson()).toList(),
       };
 }
 

packages/tiled/lib/src/exporter/export_value.dart

@@ -55,8 +55,7 @@ class _ExportableColor extends ExportValue {
   const _ExportableColor(this.color);
 
   static String _hex(int value) {
-    final str = value.toRadixString(16).padLeft(2, '0');
-    return str.substring(str.length - 2, str.length - 1);
+    return value.toRadixString(16).padLeft(2, '0');
   }
 
   String get export =>

packages/tiled/lib/src/exporter/exportable.dart

@@ -2,4 +2,7 @@ part of tiled;
 
 abstract class Exportable {
   ExportResolver export(ExportSettings settings);
+
+  XmlNode exportXml(ExportSettings settings) => export(settings).exportXml();
+  dynamic exportJson(ExportSettings settings) => export(settings).exportJson();
 }

packages/tiled/lib/src/objects/tiled_object.dart

@@ -213,10 +213,10 @@ class TiledObject extends Exportable {
                 'points': polygon.toExport(),
               },
               {},
-              properties,
             ),
           if (text != null) 'text': text!.export(settings),
         },
+        properties
       ),
       json: ExportElement(
         'object',

packages/tiled/lib/src/tiled_map.dart

@@ -55,7 +55,7 @@ part of tiled;
 ///
 /// Can contain any number: <tileset>, <layer>, <objectgroup>, <imagelayer>,
 /// <group> (since 1.0), <editorsettings> (since 1.3)
-class TiledMap {
+class TiledMap with Exportable {
   TileMapType type;
   String version;
   String? tiledVersion;
@@ -359,6 +359,7 @@ class TiledMap {
     );
   }
 
+  @override
   ExportElement export(ExportSettings settings) => ExportElement(
         'map',
         {
@@ -367,7 +368,7 @@ class TiledMap {
 
           'orientation': orientation?.name.toExport(),
           'renderorder': renderOrder.name.toExport(),
-          'compressionLevel': '-1'.toExport(),
+          'compressionlevel': '-1'.toExport(),
 
           'width': width.toExport(),
           'height': height.toExport(),
@@ -379,14 +380,14 @@ class TiledMap {
           'staggerindex': staggerIndex?.name.toExport(),
           // 'parallaxoriginx': , 'parallaxoriginy': , Not supplied by this class
 
-          'backgroundColor': backgroundColor?.toExport(),
+          'backgroundcolor': backgroundColor?.toExport(),
           'nextlayerid': nextLayerId?.toExport(),
           'nextobjectid': nextObjectId?.toExport(),
           'infinite': infinite.toExport(),
         }.nonNulls(),
         {
-          'layers': ExportList.from(layers, settings),
           'tilesets': ExportList.from(tilesets, settings),
+          'layers': ExportList.from(layers, settings),
         },
         properties,
       );

packages/tiled/lib/src/tileset/tile.dart

@@ -18,7 +18,7 @@ part of tiled;
 ///
 /// Can contain at most one: <properties>, <image> (since 0.9), <objectgroup>,
 /// <animation>.
-class Tile implements Exportable {
+class Tile with Exportable {
   int localId;
   String? type;
   double probability;
@@ -50,40 +50,44 @@ class Tile implements Exportable {
   /// Will be same as [type].
   String? get class_ => type;
 
-  Tile.parse(Parser parser)
-      : this(
-          localId: parser.getInt('id'),
+  factory Tile.parse(Parser parser) {
+    final image = parser.getSingleChildOrNullAs('image', TiledImage.parse);
+    final x = parser.getDoubleOrNull('x');
+    final y = parser.getDoubleOrNull('y');
+    final width = parser.getDoubleOrNull('width');
+    final height = parser.getDoubleOrNull('height');
 
-          /// Tiled 1.9 "type" has been moved to "class"
-          type:
-              parser.getStringOrNull('class') ?? parser.getStringOrNull('type'),
+    final imageRect = [image, x, y, width, height].contains(null)
+        ? null
+        : Rectangle(x!, y!, width!, height!);
 
-          probability: parser.getDouble('probability', defaults: 0),
-          terrain: parser
-                  .getStringOrNull('terrain')
-                  ?.split(',')
-                  .map((str) => str.isEmpty ? null : int.parse(str))
-                  .toList() ??
-              [],
-          image: parser.getSingleChildOrNullAs('image', TiledImage.parse),
-          imageRect: Rectangle(
-            parser.getDoubleOrNull('x') ?? 0,
-            parser.getDoubleOrNull('y') ?? 0,
-            parser.getDoubleOrNull('width') ?? 0,
-            parser.getDoubleOrNull('height') ?? 0,
-          ),
-          objectGroup:
-              parser.getSingleChildOrNullAs('objectgroup', Layer.parse),
-          animation: parser.formatSpecificParsing(
-            (json) => json.getChildrenAs('animation', Frame.parse),
-            (xml) =>
-                xml
-                    .getSingleChildOrNull('animation')
-                    ?.getChildrenAs('frame', Frame.parse) ??
-                [],
-          ),
-          properties: parser.getProperties(),
-        );
+    return Tile(
+      localId: parser.getInt('id'),
+
+      /// Tiled 1.9 "type" has been moved to "class"
+      type: parser.getStringOrNull('class') ?? parser.getStringOrNull('type'),
+
+      probability: parser.getDouble('probability', defaults: 0),
+      terrain: parser
+              .getStringOrNull('terrain')
+              ?.split(',')
+              .map((str) => str.isEmpty ? null : int.parse(str))
+              .toList() ??
+          [],
+      image: image,
+      imageRect: imageRect,
+      objectGroup: parser.getSingleChildOrNullAs('objectgroup', Layer.parse),
+      animation: parser.formatSpecificParsing(
+        (json) => json.getChildrenAs('animation', Frame.parse),
+        (xml) =>
+            xml
+                .getSingleChildOrNull('animation')
+                ?.getChildrenAs('frame', Frame.parse) ??
+            [],
+      ),
+      properties: parser.getProperties(),
+    );
+  }
 
   @override
   ExportResolver export(ExportSettings settings) {
@@ -98,7 +102,7 @@ class Tile implements Exportable {
     }.nonNulls();
 
     final children = {
-      'image': image!.export(settings),
+      'image': image?.export(settings),
       'objectgroup': objectGroup?.export(settings)
     }.nonNulls();
 

packages/tiled/lib/src/tileset/tileset.dart

@@ -42,7 +42,7 @@ part of tiled;
 /// (since 1.5)
 ///
 /// Can contain any number: <tile>
-class Tileset implements Exportable {
+class Tileset with Exportable {
   int? firstGid;
   String? source;
   String? name;
@@ -284,23 +284,21 @@ class Tileset implements Exportable {
       'class': type.name.toExport(),
       'type': type.name.toExport(),
 
-      'tilewidth': tileWidth!.toExport(),
-      'tileheigth': tileHeight!.toExport(),
+      'tilewidth': tileWidth?.toExport(),
+      'tileheigth': tileHeight?.toExport(),
       'spacing': spacing.toExport(),
       'margin': margin.toExport(),
 
-      'tilecount': tileCount!.toExport(),
-      'columns': columns!.toExport(),
+      'tilecount': tileCount?.toExport(),
+      'columns': columns?.toExport(),
       'objectalignment': objectAlignment.name.toExport(),
       // 'tilerendersize': , Not supported by this class
       // 'fillmode': , Not supported by this class
-    };
+    }.nonNulls();
 
     final common = {
-      if (image != null)
-        'image': image!.export(settings)
-      else
-        'tiles': ExportList.from(tiles, settings),
+      'image': image?.export(settings),
+      'tiles': ExportList.from(tiles, settings),
       'tileoffset': tileOffset?.export(settings),
       'grid': grid?.export(settings),
       // 'terraintypes': , DEPRECATED
@@ -316,15 +314,22 @@ class Tileset implements Exportable {
 
     return ExportFormatSpecific(
       xml: ExportElement(
-        'wangsets',
+        'tileset',
         fields,
         {
           ...common,
-          'wangsets': wangsets,
+          if (wangSets.isNotEmpty) 'wangsets': wangsets,
         },
         properties,
       ),
-      json: wangsets,
+      json: ExportElement(
+        'tileset',
+        fields,
+        {
+          ...common,
+          'wangsets': ExportList.from(wangSets, settings),
+        },
+      ),
     );
   }
 }

packages/tiled/lib/src/tileset/wang/wang_color.dart

@@ -13,7 +13,7 @@ part of tiled;
 ///   others in case of multiple options. (defaults to 0)
 ///
 /// Can contain at most one: <properties>
-class WangColor implements Exportable {
+class WangColor with Exportable {
   String name;
   String color;
   int tile;

packages/tiled/lib/src/tileset/wang/wang_tile.dart

@@ -19,7 +19,7 @@ part of tiled;
 /// * hflip: Whether the tile is flipped horizontally (removed in Tiled 1.5).
 /// * vflip: Whether the tile is flipped vertically (removed in Tiled 1.5).
 /// * dflip: Whether the tile is flipped on its diagonal (removed in Tiled 1.5).
-class WangTile implements Exportable {
+class WangTile with Exportable {
   int tileId;
   List<int> wangId;
   bool hFlip;