From e4187f3f91195cbe9cbe42ae7d8db7ab81182f89 Mon Sep 17 00:00:00 2001 From: jin_ai_yuan Date: Thu, 20 Oct 2022 14:05:59 +0800 Subject: [PATCH] Bugfix package assets path (#321) * bugfix: replace the path field with the correct one * fix unit test issues Co-authored-by: Daichi Furiya --- .../core/lib/generators/integrations/flare_integration.dart | 2 +- .../core/lib/generators/integrations/lottie_integration.dart | 2 +- packages/core/lib/generators/integrations/rive_integration.dart | 2 +- packages/core/lib/generators/integrations/svg_integration.dart | 2 +- .../actual_data/assets_package_parameter.gen.dart | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/lib/generators/integrations/flare_integration.dart b/packages/core/lib/generators/integrations/flare_integration.dart index 6a48517f..0985596d 100644 --- a/packages/core/lib/generators/integrations/flare_integration.dart +++ b/packages/core/lib/generators/integrations/flare_integration.dart @@ -56,7 +56,7 @@ class FlareIntegration extends Integration { ); } - String get path => _assetName; + String get path => ${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 dd3d033e..ad1922d5 100644 --- a/packages/core/lib/generators/integrations/lottie_integration.dart +++ b/packages/core/lib/generators/integrations/lottie_integration.dart @@ -87,7 +87,7 @@ class LottieIntegration extends Integration { ); } - String get path => _assetName; + String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''}; }'''; @override diff --git a/packages/core/lib/generators/integrations/rive_integration.dart b/packages/core/lib/generators/integrations/rive_integration.dart index 370f0623..3d5e41bb 100644 --- a/packages/core/lib/generators/integrations/rive_integration.dart +++ b/packages/core/lib/generators/integrations/rive_integration.dart @@ -47,7 +47,7 @@ class RiveIntegration extends Integration { ); } - String get path => _assetName; + String get path => ${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 44112361..09758597 100644 --- a/packages/core/lib/generators/integrations/svg_integration.dart +++ b/packages/core/lib/generators/integrations/svg_integration.dart @@ -64,7 +64,7 @@ class SvgIntegration extends Integration { ); } - String get path => _assetName; + String get path => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''}; }'''; @override 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 57452147..df97bc65 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,5 @@ class SvgGenImage { ); } - String get path => _assetName; + String get path => 'packages/test/$_assetName'; }