From 9f2e0520436956b036bb5c182a39d53a6d413379 Mon Sep 17 00:00:00 2001
From: jinaiyuanbaojie <jinaiyuanbaojie@163.com>
Date: Tue, 18 Oct 2022 18:33:52 +0800
Subject: [PATCH 1/2] bugfix: replace the path field with the correct one

---
 .../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 ++
 4 files changed, 5 insertions(+), 3 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..3af31ae8 100644
--- a/packages/core/lib/generators/integrations/svg_integration.dart
+++ b/packages/core/lib/generators/integrations/svg_integration.dart
@@ -65,6 +65,8 @@ class SvgIntegration extends Integration {
   }
 
   String get path => _assetName;
+
+  String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_assetName\''};
 }''';
 
   @override

From c9857d0c2c616a779915d481cbcc0a210794b672 Mon Sep 17 00:00:00 2001
From: jinaiyuanbaojie <jinaiyuanbaojie@163.com>
Date: Tue, 18 Oct 2022 18:46:22 +0800
Subject: [PATCH 2/2] fix unit test issues

---
 .../core/lib/generators/integrations/svg_integration.dart     | 4 +---
 .../actual_data/assets_package_parameter.gen.dart             | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/core/lib/generators/integrations/svg_integration.dart b/packages/core/lib/generators/integrations/svg_integration.dart
index 3af31ae8..09758597 100644
--- a/packages/core/lib/generators/integrations/svg_integration.dart
+++ b/packages/core/lib/generators/integrations/svg_integration.dart
@@ -64,9 +64,7 @@ class SvgIntegration extends Integration {
     );
   }
 
-  String get path => _assetName;
-
-  String get keyName => ${packageParameterLiteral.isEmpty ? '_assetName' : '\'packages/$packageParameterLiteral/\$_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';
 }