diff --git a/example/assets/json/list.json b/example/assets/json/list.json new file mode 100644 index 00000000..168f37d6 --- /dev/null +++ b/example/assets/json/list.json @@ -0,0 +1,5 @@ +[ + { + "id": "ABC42" + } +] diff --git a/example/assets/json/fruits.json b/example/assets/json/map.json similarity index 100% rename from example/assets/json/fruits.json rename to example/assets/json/map.json diff --git a/example/lib/gen/assets.gen.dart b/example/lib/gen/assets.gen.dart index 95692596..e3eb0f86 100644 --- 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 get values => [fruits]; + List get values => [list, map]; } class $AssetsLottieGen { diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 2d0f783a..a02f0e1b 100644 --- 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 index ad1922d5..614d8846 100644 --- 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 index cf8794b5..83d57448 100644 --- 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 index bb5fe85d..d56c3a10 100644 --- a/packages/core/test_resources/actual_data/assets.gen.dart +++ b/packages/core/test_resources/actual_data/assets.gen.dart @@ -65,11 +65,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 get values => [fruits]; + List get values => [list, map]; } class $AssetsMovieGen { 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 index 37bdf5c4..16398766 100644 --- a/packages/core/test_resources/actual_data/assets_camel_case.gen.dart +++ b/packages/core/test_resources/actual_data/assets_camel_case.gen.dart @@ -52,8 +52,11 @@ class Assets { static const AssetGenImage imagesProfilePng = AssetGenImage('assets/images/profile.png'); - /// File path: assets/json/fruits.json - static const String jsonFruits = 'assets/json/fruits.json'; + /// File path: assets/json/list.json + static const String jsonList = 'assets/json/list.json'; + + /// File path: assets/json/map.json + static const String jsonMap = 'assets/json/map.json'; /// File path: pictures/chip5.jpg static const AssetGenImage picturesChip5 = @@ -72,7 +75,8 @@ class Assets { imagesLogo, imagesProfileJpg, imagesProfilePng, - jsonFruits, + jsonList, + jsonMap, picturesChip5 ]; } 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 index 8e06f5c9..76229d86 100644 --- a/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_no_integrations.gen.dart @@ -51,11 +51,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 get values => [fruits]; + List get values => [list, map]; } class $AssetsImagesChip3Gen { 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 index bfcfe879..af091b6d 100644 --- 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 @@ -40,11 +40,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 get values => [fruits]; + List get values => [list, map]; } class $AssetsImagesChip4Gen { 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 index 6e6f19d2..c78b0dc6 100644 --- a/packages/core/test_resources/actual_data/assets_snake_case.gen.dart +++ b/packages/core/test_resources/actual_data/assets_snake_case.gen.dart @@ -53,8 +53,11 @@ class Assets { static const AssetGenImage images_profile_png = AssetGenImage('assets/images/profile.png'); - /// File path: assets/json/fruits.json - static const String json_fruits = 'assets/json/fruits.json'; + /// File path: assets/json/list.json + static const String json_list = 'assets/json/list.json'; + + /// File path: assets/json/map.json + static const String json_map = 'assets/json/map.json'; /// File path: pictures/chip5.jpg static const AssetGenImage pictures_chip5 = @@ -73,7 +76,8 @@ class Assets { images_logo, images_profile_jpg, images_profile_png, - json_fruits, + json_list, + json_map, pictures_chip5 ]; } diff --git a/packages/core/test_resources/assets/json/list.json b/packages/core/test_resources/assets/json/list.json new file mode 100644 index 00000000..168f37d6 --- /dev/null +++ b/packages/core/test_resources/assets/json/list.json @@ -0,0 +1,5 @@ +[ + { + "id": "ABC42" + } +] diff --git a/packages/core/test_resources/assets/json/fruits.json b/packages/core/test_resources/assets/json/map.json similarity index 100% rename from packages/core/test_resources/assets/json/fruits.json rename to packages/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 index ae880056..b8bfb2e0 100644 --- 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 index ed560650..f5d037b8 100644 --- 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 index 55b77ddd..01bdfc2a 100644 --- 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 \ No newline at end of file + - 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 index 2c20aadc..8aaa6a87 100644 --- 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 index 8ace452b..f9bea45e 100644 --- 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 index 6b0dc9b5..66074661 100644 --- 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