fix: #323 TypeError when list json with lottie (#324)

FlutterGen · Oct 20, 2022 · 9e4f630 · 9e4f630
1 parent c43af97
commit 9e4f630
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 28 deletions.
diff --git a/example/assets/json/list.json b/example/assets/json/list.json
@@ -0,0 +1,5 @@
+[
+  {
+    "id": "ABC42"
+  }
+]
diff --git a/example/assets/json/fruits.json → example/assets/json/map.json b/example/assets/json/fruits.json → example/assets/json/map.json
diff --git a/example/lib/gen/assets.gen.dart b/example/lib/gen/assets.gen.dart
@@ -56,11 +56,14 @@ class $AssetsImagesGen {
 class $AssetsJsonGen {
   const $AssetsJsonGen();
 
-  /// File path: assets/json/fruits.json
-  String get fruits => 'assets/json/fruits.json';
+  /// File path: assets/json/list.json
+  String get list => 'assets/json/list.json';
+
+  /// File path: assets/json/map.json
+  String get map => 'assets/json/map.json';
 
   /// List of all assets
-  List<String> get values => [fruits];
+  List<String> get values => [list, map];
 }
 
 class $AssetsLottieGen {

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -166,7 +166,7 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
+    - assets/json/
     - pictures/chip5.jpg
     - assets/flare/
     - assets/rive/

diff --git a/packages/core/lib/generators/integrations/lottie_integration.dart b/packages/core/lib/generators/integrations/lottie_integration.dart
@@ -120,6 +120,9 @@ class LottieIntegration extends Integration {
     } on FormatException catch (e) {
       // Catches bad/corrupted json and reports it to user.
       stderr.writeln(e.message);
+    } on TypeError catch(e) {
+      // Catches bad/corrupted json and reports it to user.
+      stderr.writeln(e);
     }
     return false;
   }

diff --git a/packages/core/test/colors_gen_test.dart b/packages/core/test/colors_gen_test.dart
@@ -50,7 +50,7 @@ void main() {
       expect(colorPath.isXml, isTrue);
 
       const wrongColorPath =
-          ColorPath('test_resources/assets/json/fruits.json');
+          ColorPath('test_resources/assets/json/map.json');
       expect(wrongColorPath.isXml, isFalse);
     });
 

diff --git a/packages/core/test_resources/actual_data/assets.gen.dart b/packages/core/test_resources/actual_data/assets.gen.dart
diff --git a/packages/core/test_resources/actual_data/assets_camel_case.gen.dart b/packages/core/test_resources/actual_data/assets_camel_case.gen.dart
diff --git a/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart
diff --git a/packages/core/test_resources/actual_data/assets_package_exclude_files.gen.dart b/packages/core/test_resources/actual_data/assets_package_exclude_files.gen.dart
diff --git a/packages/core/test_resources/actual_data/assets_snake_case.gen.dart b/packages/core/test_resources/actual_data/assets_snake_case.gen.dart
diff --git a/packages/core/test_resources/assets/json/list.json b/packages/core/test_resources/assets/json/list.json
@@ -0,0 +1,5 @@
+[
+  {
+    "id": "ABC42"
+  }
+]
diff --git a/...re/test_resources/assets/json/fruits.json → .../core/test_resources/assets/json/map.json b/...re/test_resources/assets/json/fruits.json → .../core/test_resources/assets/json/map.json
diff --git a/packages/core/test_resources/pubspec_assets.yaml b/packages/core/test_resources/pubspec_assets.yaml
@@ -18,7 +18,7 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
+    - assets/json/
     - pictures/chip5.jpg
     - assets/flare/
     - assets/movie/

diff --git a/packages/core/test_resources/pubspec_assets_camel_case.yaml b/packages/core/test_resources/pubspec_assets_camel_case.yaml
@@ -18,5 +18,5 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
+    - assets/json/
     - pictures/chip5.jpg
diff --git a/packages/core/test_resources/pubspec_assets_exclude_files.yaml b/packages/core/test_resources/pubspec_assets_exclude_files.yaml
@@ -7,7 +7,7 @@ flutter_gen:
   integrations:
     flutter_svg: true
 
-  assets: 
+  assets:
     exclude:
       - assets/images/chip3/*.jpg
       - assets/images/*.png
@@ -24,5 +24,5 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
-    - pictures/chip5.jpg
+    - assets/json/
+    - pictures/chip5.jpg
diff --git a/packages/core/test_resources/pubspec_assets_no_integrations.yaml b/packages/core/test_resources/pubspec_assets_no_integrations.yaml
@@ -14,5 +14,5 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
+    - assets/json/
     - pictures/chip5.jpg
diff --git a/packages/core/test_resources/pubspec_assets_snake_case.yaml b/packages/core/test_resources/pubspec_assets_snake_case.yaml
@@ -18,5 +18,5 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
+    - assets/json/
     - pictures/chip5.jpg
diff --git a/packages/core/test_resources/pubspec_normal.yaml b/packages/core/test_resources/pubspec_normal.yaml
@@ -24,7 +24,7 @@ flutter:
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
     - assets/images/icons/dart@test.svg
-    - assets/json/fruits.json
+    - assets/json/
     - pictures/chip5.jpg
   fonts:
     - family: Raleway