Fix up rebase

Author: spydon

packages/tiled/lib/src/parser.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:tiled/tiled.dart';
 import 'package:xml/xml.dart';
 
@@ -14,7 +16,8 @@ class XmlParser extends Parser {
 
   XmlParser(this.element, {super.tsxProviders, super.templateProviders});
 
-  XmlParser.fromString(String string, {
+  XmlParser.fromString(
+    String string, {
     super.tsxProviders,
     super.templateProviders,
   }) : element = XmlDocument.parse(string).rootElement;
@@ -55,9 +58,7 @@ class XmlParser extends Parser {
 
   @override
   T formatSpecificParsing<T>(
-    T Function(JsonParser) json,
-    T Function(XmlParser) xml
-  ) {
+      T Function(JsonParser) json, T Function(XmlParser) xml) {
     return xml(this);
   }
 }
@@ -67,8 +68,10 @@ class JsonParser extends Parser {
 
   JsonParser(this.json, {super.tsxProviders, super.templateProviders});
 
-  JsonParser.fromString(String string, {
-    super.tsxProviders, super.templateProviders,
+  JsonParser.fromString(
+    String string, {
+    super.tsxProviders,
+    super.templateProviders,
   }) : json = jsonDecode(string) as Map<String, dynamic>;
 
   @override

packages/tiled/lib/src/provider.dart

@@ -1,4 +1,4 @@
-part of tiled;
+import 'package:tiled/tiled.dart';
 
 abstract class Provider<T> {
   bool canProvide(String path);
@@ -8,4 +8,4 @@ abstract class Provider<T> {
 }
 
 typedef ParserProvider = Provider<Parser>;
-typedef ImagePathProvider = Provider<String>;
+typedef ImagePathProvider = Provider<String>;

packages/tiled/lib/src/tiled_map.dart

@@ -1,4 +1,5 @@
 import 'dart:collection';
+import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:tiled/tiled.dart';

packages/tiled/lib/tiled.dart

@@ -14,8 +14,8 @@ export 'src/layer.dart';
 export 'src/objects/text.dart';
 export 'src/objects/tiled_object.dart';
 export 'src/parser.dart';
+export 'src/provider.dart';
 export 'src/template.dart';
-export 'src/tile_map_parser.dart';
 export 'src/tiled_map.dart';
 export 'src/tileset/grid.dart';
 export 'src/tileset/terrain.dart';
@@ -25,4 +25,3 @@ export 'src/tileset/tileset.dart';
 export 'src/tileset/wang/wang_color.dart';
 export 'src/tileset/wang/wang_set.dart';
 export 'src/tileset/wang/wang_tile.dart';
-export 'src/tsx_provider.dart';