feat: add keyName to integrations (#330)

FlutterGen · Oct 31, 2022 · da7bece · da7bece
1 parent c4c18e5
commit da7bece
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 12 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
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
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
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
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
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