From da7bece86a86a1876466e73cc643812e55987bd3 Mon Sep 17 00:00:00 2001 From: Daichi Furiya Date: Mon, 31 Oct 2022 16:10:50 +0900 Subject: [PATCH] feat: add keyName to integrations (#330) --- example/lib/gen/assets.gen.dart | 8 ++++++++ example/lib/main.dart | 4 ++++ example_resources/lib/gen/assets.gen.dart | 16 ++++++++++++---- .../integrations/flare_integration.dart | 4 +++- .../integrations/lottie_integration.dart | 6 ++++-- .../integrations/rive_integration.dart | 4 +++- .../generators/integrations/svg_integration.dart | 4 +++- packages/core/test/colors_gen_test.dart | 3 +-- .../test_resources/actual_data/assets.gen.dart | 4 ++++ .../assets_flare_integrations.gen.dart | 2 ++ .../assets_lottie_integrations.gen.dart | 2 ++ .../assets_package_parameter.gen.dart | 4 +++- .../assets_rive_integrations.gen.dart | 2 ++ .../actual_data/assets_svg_integrations.gen.dart | 2 ++ 14 files changed, 53 insertions(+), 12 deletions(-) diff --git a/example/lib/gen/assets.gen.dart b/example/lib/gen/assets.gen.dart index e3eb0f86..36ef3bff 100644 --- a/example/lib/gen/assets.gen.dart +++ b/example/lib/gen/assets.gen.dart @@ -304,6 +304,8 @@ class SvgGenImage { } String get path => _assetName; + + String get keyName => _assetName; } class FlareGenImage { @@ -345,6 +347,8 @@ class FlareGenImage { } String get path => _assetName; + + String get keyName => _assetName; } class RiveGenImage { @@ -378,6 +382,8 @@ class RiveGenImage { } String get path => _assetName; + + String get keyName => _assetName; } class LottieGenImage { @@ -435,4 +441,6 @@ class LottieGenImage { } String get path => _assetName; + + String get keyName => _assetName; } diff --git a/example/lib/main.dart b/example/lib/main.dart index 96940529..18052b97 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -89,6 +89,10 @@ void main() async { // ), // example_resource package. + Text(MyAssets.images.icons.kmm.path), + Text(MyAssets.images.icons.kmm.keyName), + Text(ResAssets.images.dart.path), + Text(ResAssets.images.dart.keyName), ResAssets.images.flutter3.image(), ResAssets.images.dart.svg(), SizedBox( diff --git a/example_resources/lib/gen/assets.gen.dart b/example_resources/lib/gen/assets.gen.dart index 7e5af32b..1e2df2ba 100644 --- a/example_resources/lib/gen/assets.gen.dart +++ b/example_resources/lib/gen/assets.gen.dart @@ -158,7 +158,9 @@ class SvgGenImage { ); } - String get path => 'packages/example_resources/$_assetName'; + String get path => _assetName; + + String get keyName => 'packages/example_resources/$_assetName'; } class FlareGenImage { @@ -199,7 +201,9 @@ class FlareGenImage { ); } - String get path => 'packages/example_resources/$_assetName'; + String get path => _assetName; + + String get keyName => 'packages/example_resources/$_assetName'; } class RiveGenImage { @@ -232,7 +236,9 @@ class RiveGenImage { ); } - String get path => 'packages/example_resources/$_assetName'; + String get path => _assetName; + + String get keyName => 'packages/example_resources/$_assetName'; } class LottieGenImage { @@ -289,5 +295,7 @@ class LottieGenImage { ); } - String get path => 'packages/example_resources/$_assetName'; + String get path => _assetName; + + String get keyName => 'packages/example_resources/$_assetName'; } diff --git a/packages/core/lib/generators/integrations/flare_integration.dart b/packages/core/lib/generators/integrations/flare_integration.dart index 0985596d..c16ee905 100644 --- a/packages/core/lib/generators/integrations/flare_integration.dart +++ b/packages/core/lib/generators/integrations/flare_integration.dart @@ -56,7 +56,9 @@ class FlareIntegration extends Integration { ); } - String get path => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''}; + String get path => _assetName; + + String get keyName => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''}; }'''; @override diff --git a/packages/core/lib/generators/integrations/lottie_integration.dart b/packages/core/lib/generators/integrations/lottie_integration.dart index 614d8846..e9e10cc7 100644 --- a/packages/core/lib/generators/integrations/lottie_integration.dart +++ b/packages/core/lib/generators/integrations/lottie_integration.dart @@ -87,7 +87,9 @@ class LottieIntegration extends Integration { ); } - String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''}; + String get path => _assetName; + + String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''}; }'''; @override @@ -120,7 +122,7 @@ 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) { + } on TypeError catch (e) { // Catches bad/corrupted json and reports it to user. stderr.writeln(e); } diff --git a/packages/core/lib/generators/integrations/rive_integration.dart b/packages/core/lib/generators/integrations/rive_integration.dart index 3d5e41bb..ff1216e6 100644 --- a/packages/core/lib/generators/integrations/rive_integration.dart +++ b/packages/core/lib/generators/integrations/rive_integration.dart @@ -47,7 +47,9 @@ class RiveIntegration extends Integration { ); } - String get path => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''}; + String get path => _assetName; + + String get keyName => ${packageExpression == null ? '_assetName' : '\'$packageExpression\$_assetName\''}; }'''; @override diff --git a/packages/core/lib/generators/integrations/svg_integration.dart b/packages/core/lib/generators/integrations/svg_integration.dart index 09758597..3af31ae8 100644 --- a/packages/core/lib/generators/integrations/svg_integration.dart +++ b/packages/core/lib/generators/integrations/svg_integration.dart @@ -64,7 +64,9 @@ class SvgIntegration extends Integration { ); } - String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''}; + String get path => _assetName; + + String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''}; }'''; @override diff --git a/packages/core/test/colors_gen_test.dart b/packages/core/test/colors_gen_test.dart index 83d57448..be66c800 100644 --- a/packages/core/test/colors_gen_test.dart +++ b/packages/core/test/colors_gen_test.dart @@ -49,8 +49,7 @@ void main() { expect(colorPath.mime, 'application/xml'); expect(colorPath.isXml, isTrue); - const wrongColorPath = - ColorPath('test_resources/assets/json/map.json'); + const wrongColorPath = 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 d56c3a10..ee372f37 100644 --- a/packages/core/test_resources/actual_data/assets.gen.dart +++ b/packages/core/test_resources/actual_data/assets.gen.dart @@ -261,6 +261,8 @@ class SvgGenImage { } String get path => _assetName; + + String get keyName => _assetName; } class FlareGenImage { @@ -302,4 +304,6 @@ class FlareGenImage { } String get path => _assetName; + + String get keyName => _assetName; } diff --git a/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart index 05522dbe..ad7ab9b5 100644 --- a/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_flare_integrations.gen.dart @@ -131,4 +131,6 @@ class FlareGenImage { } String get path => _assetName; + + String get keyName => _assetName; } diff --git a/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart index ac9ef4f0..cc2e36b2 100644 --- a/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_lottie_integrations.gen.dart @@ -147,4 +147,6 @@ class LottieGenImage { } String get path => _assetName; + + String get keyName => _assetName; } diff --git a/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart b/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart index df97bc65..e92a83c7 100644 --- a/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart +++ b/packages/core/test_resources/actual_data/assets_package_parameter.gen.dart @@ -161,5 +161,7 @@ class SvgGenImage { ); } - String get path => 'packages/test/$_assetName'; + String get path => _assetName; + + String get keyName => 'packages/test/$_assetName'; } diff --git a/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart index d4543701..c5b7cbec 100644 --- a/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_rive_integrations.gen.dart @@ -122,4 +122,6 @@ class RiveGenImage { } String get path => _assetName; + + String get keyName => _assetName; } diff --git a/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart b/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart index d0181ad2..3bde6d20 100644 --- a/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart +++ b/packages/core/test_resources/actual_data/assets_svg_integrations.gen.dart @@ -150,4 +150,6 @@ class SvgGenImage { } String get path => _assetName; + + String get keyName => _assetName; }