fix: Added the ability to support the at symbol (@) in file names (#135)

wasabeef · web-flow · commit 391d08dd8ee3 · 2021-10-18T23:53:57.000+09:00
diff --git a/README.md b/README.md
@@ -157,6 +157,7 @@ flutter:
     - assets/images/chip3/chip.jpg
     - assets/images/chip4/chip.jpg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.json
     - assets/flare/Penguin.flr
     - pictures/ocean_view.jpg
@@ -256,11 +257,12 @@ flutter:
 The root directory will be omitted if it is either **`assets`** or **`asset`**.
 
 ```
-assets/images/chip3/chip.jpg  => Assets.images.chip3.chip
-assets/images/chip4/chip.jpg  => Assets.images.chip4.chip
-assets/images/icons/paint.svg => Assets.images.icons.paint
-assets/json/fruits.json       => Assets.json.fruits
-pictures/ocean_view.jpg       => Assets.pictures.oceanView
+assets/images/chip3/chip.jpg      => Assets.images.chip3.chip
+assets/images/chip4/chip.jpg      => Assets.images.chip4.chip
+assets/images/icons/paint.svg     => Assets.images.icons.paint
+assets/images/icons/dart@test.svg => Assets.images.icons.dartTest
+assets/json/fruits.json           => Assets.json.fruits
+pictures/ocean_view.jpg           => Assets.pictures.oceanView
 ```
 
 <details><summary>Example of code generated by FlutterGen</summary>
@@ -337,6 +339,8 @@ class $AssetsImagesChip4Gen {
 class $AssetsImagesIconsGen {
   const $AssetsImagesIconsGen();
 
+  SvgGenImage get dartTest =>
+      const SvgGenImage('assets/images/icons/dart@test.svg');
   SvgGenImage get fuchsia =>
       const SvgGenImage('assets/images/icons/fuchsia.svg');
   SvgGenImage get kmm => const SvgGenImage('assets/images/icons/kmm.svg');
diff --git a/example/assets/images/icons/dart@test.svg b/example/assets/images/icons/dart@test.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
+<g>
+	<path style="fill:#546A79;" d="M256.007,174.491c41.064,0,74.358,33.294,74.358,74.369c0,41.064-33.294,74.358-74.358,74.358
+		c-41.076,0-74.369-33.294-74.369-74.358C181.638,207.784,214.931,174.491,256.007,174.491z"/>
+	<path style="fill:#546A79;" d="M439.059,248.86c0,35.723-10.234,69.074-27.941,97.245h-0.665v-51.482h-11.438l5.719-62.931H380.7
+		c-8.389-61.396-61.006-108.683-124.694-108.683c-69.51,0-125.851,56.341-125.851,125.851c0,69.498,56.341,125.851,125.851,125.851
+		c46.336,0,86.839-25.053,108.683-62.358v68.077v15.736c-30.394,22.463-67.986,35.746-108.683,35.746
+		c-101.107,0-183.063-81.956-183.063-183.052c0-101.107,81.956-183.063,183.063-183.063
+		C357.103,65.796,439.059,147.753,439.059,248.86z"/>
+</g>
+<g>
+	<path style="fill:#E7ECED;" d="M380.7,231.692h-10.292l5.73,62.931H364.69v17.73c-21.844,37.305-62.347,62.358-108.683,62.358
+		c-69.51,0-125.851-56.353-125.851-125.851c0-69.51,56.341-125.851,125.851-125.851C319.695,123.009,372.311,170.296,380.7,231.692z
+		 M330.365,248.86c0-41.076-33.294-74.369-74.358-74.369c-41.076,0-74.369,33.294-74.369,74.369
+		c0,41.064,33.294,74.358,74.369,74.358C297.071,323.218,330.365,289.924,330.365,248.86z"/>
+	<path style="fill:#E7ECED;" d="M496.26,248.86c0,71.149-36.652,139.054-85.807,183.052v-5.719V380.43v-34.325h0.665
+		c17.707-28.171,27.941-61.522,27.941-97.245c0-101.107-81.956-183.063-183.052-183.063c-101.107,0-183.063,81.956-183.063,183.063
+		c0,101.096,81.956,183.052,183.063,183.052c40.697,0,78.289-13.283,108.683-35.746v30.027V463.2
+		c-32.64,16.572-69.567,25.913-108.683,25.913c-132.693,0-240.264-107.56-240.264-240.253S123.314,8.596,256.007,8.596
+		S496.26,116.167,496.26,248.86z"/>
+	<polygon style="fill:#E7ECED;" points="410.453,380.43 410.453,426.193 364.69,426.193 364.69,396.166 364.69,380.43 	"/>
+</g>
+<g>
+	<polygon style="fill:#AFB6BB;" points="364.69,463.2 364.69,426.193 410.453,426.193 410.453,431.912 410.453,466.237 
+		364.69,466.237 	"/>
+	<polygon style="fill:#AFB6BB;" points="364.69,312.353 364.69,294.623 376.139,294.623 399.015,294.623 410.453,294.623 
+		410.453,346.105 410.453,380.43 364.69,380.43 	"/>
+</g>
+<polygon style="fill:#F4661E;" points="380.7,231.692 404.734,231.692 399.015,294.623 376.139,294.623 370.409,231.692 "/>
+<path d="M431.971,72.891C384.971,25.887,322.48,0,256.007,0S127.041,25.887,80.037,72.891S7.147,182.388,7.147,248.86
+	s25.887,128.964,72.89,175.965c47.003,47,109.498,72.884,175.97,72.884c36.544,0,71.599-7.703,104.354-22.876h18.62v37.169h17.191
+	v-37.169h22.876v-39.144c24.701-22.784,45.569-50.824,60.466-81.351c16.578-33.974,25.34-70.448,25.34-105.477
+	C504.855,182.387,478.971,119.893,431.971,72.891z M401.858,371.834h-28.573v-68.616h28.573V371.834z M391.165,286.027h-7.178
+	l-4.165-45.74h15.498L391.165,286.027z M366.726,286.027h-10.632v22.644v1.305c-21.239,34.687-59.376,56.138-100.087,56.138
+	c-64.655,0-117.255-52.6-117.255-117.257s52.601-117.255,117.255-117.255c55.005,0,102.528,38.695,114.399,91.492h-9.412
+	L366.726,286.027z M401.858,389.026v28.572h-28.573v-28.572H401.858z M408.426,286.027l5.72-62.931h-26.168
+	c-5.65-29.029-20.808-55.517-43.211-75.224c-24.53-21.576-56.051-33.459-88.762-33.459c-74.134,0-134.447,60.312-134.447,134.447
+	c0,74.135,60.312,134.448,134.447,134.448c38.417,0,74.826-16.664,100.087-44.728v53.179
+	c-29.41,20.658-63.919,31.559-100.087,31.559c-96.202,0-174.468-78.261-174.468-174.458c0-96.201,78.266-174.467,174.468-174.467
+	c96.195,0,174.456,78.266,174.456,174.467c0,21.39-3.913,42.405-11.415,62.11v-24.942H408.426z M373.285,457.641v-22.853h28.573
+	v22.852h-28.573V457.641z M464.064,346.798c-11.556,23.684-26.942,45.765-45.015,64.778v-61.978
+	c18.709-30.207,28.606-65.006,28.606-100.738c0-105.681-85.973-191.658-191.648-191.658c-105.681,0-191.659,85.978-191.659,191.658
+	c0,105.676,85.978,191.649,191.659,191.649c35.752,0,70.031-9.702,100.087-28.183v42.28v3.255
+	c-31.32,15.038-64.966,22.658-100.087,22.658c-127.742,0-231.669-103.921-231.669-231.657
+	c0-127.742,103.927-231.669,231.669-231.669c127.736,0,231.656,103.927,231.656,231.669
+	C487.664,281.292,479.504,315.157,464.064,346.798z"/>
+<path d="M256.007,165.895c-45.747,0-82.965,37.218-82.965,82.965c0,45.74,37.218,82.953,82.965,82.953
+	c45.74,0,82.952-37.213,82.952-82.953C338.96,203.113,301.747,165.895,256.007,165.895z M256.007,314.622
+	c-36.268,0-65.774-29.5-65.774-65.762c0-36.268,29.506-65.774,65.774-65.774c36.261,0,65.761,29.506,65.761,65.774
+	C321.769,285.121,292.269,314.622,256.007,314.622z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/example/lib/gen/assets.gen.dart b/example/lib/gen/assets.gen.dart
@@ -75,6 +75,8 @@ class $AssetsImagesChip4Gen {
 class $AssetsImagesIconsGen {
   const $AssetsImagesIconsGen();
 
+  SvgGenImage get dartTest =>
+      const SvgGenImage('assets/images/icons/dart@test.svg');
   SvgGenImage get fuchsia =>
       const SvgGenImage('assets/images/icons/fuchsia.svg');
   SvgGenImage get kmm => const SvgGenImage('assets/images/icons/kmm.svg');
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -64,6 +64,7 @@ flutter:
     - assets/images/icons/fuchsia.svg
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.json
     - pictures/chip5.jpg
     - assets/flare/
diff --git a/packages/core/lib/utils/string.dart b/packages/core/lib/utils/string.dart
@@ -22,6 +22,7 @@ List<String> _intoWords(String path) {
     '_',
     '\\',
     '-',
+    '@',
   ];
   final _upperAlphaRegex = RegExp(r'[A-Z]');
   final _lowerAlphaRegex = RegExp(r'[a-z]');
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_camel_case.gen.dart b/packages/core/test_resources/actual_data/assets_camel_case.gen.dart
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
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_snake_case.gen.dart b/packages/core/test_resources/actual_data/assets_snake_case.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
diff --git a/packages/core/test_resources/assets/images/icons/dart@test.svg b/packages/core/test_resources/assets/images/icons/dart@test.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
+<g>
+	<path style="fill:#546A79;" d="M256.007,174.491c41.064,0,74.358,33.294,74.358,74.369c0,41.064-33.294,74.358-74.358,74.358
+		c-41.076,0-74.369-33.294-74.369-74.358C181.638,207.784,214.931,174.491,256.007,174.491z"/>
+	<path style="fill:#546A79;" d="M439.059,248.86c0,35.723-10.234,69.074-27.941,97.245h-0.665v-51.482h-11.438l5.719-62.931H380.7
+		c-8.389-61.396-61.006-108.683-124.694-108.683c-69.51,0-125.851,56.341-125.851,125.851c0,69.498,56.341,125.851,125.851,125.851
+		c46.336,0,86.839-25.053,108.683-62.358v68.077v15.736c-30.394,22.463-67.986,35.746-108.683,35.746
+		c-101.107,0-183.063-81.956-183.063-183.052c0-101.107,81.956-183.063,183.063-183.063
+		C357.103,65.796,439.059,147.753,439.059,248.86z"/>
+</g>
+<g>
+	<path style="fill:#E7ECED;" d="M380.7,231.692h-10.292l5.73,62.931H364.69v17.73c-21.844,37.305-62.347,62.358-108.683,62.358
+		c-69.51,0-125.851-56.353-125.851-125.851c0-69.51,56.341-125.851,125.851-125.851C319.695,123.009,372.311,170.296,380.7,231.692z
+		 M330.365,248.86c0-41.076-33.294-74.369-74.358-74.369c-41.076,0-74.369,33.294-74.369,74.369
+		c0,41.064,33.294,74.358,74.369,74.358C297.071,323.218,330.365,289.924,330.365,248.86z"/>
+	<path style="fill:#E7ECED;" d="M496.26,248.86c0,71.149-36.652,139.054-85.807,183.052v-5.719V380.43v-34.325h0.665
+		c17.707-28.171,27.941-61.522,27.941-97.245c0-101.107-81.956-183.063-183.052-183.063c-101.107,0-183.063,81.956-183.063,183.063
+		c0,101.096,81.956,183.052,183.063,183.052c40.697,0,78.289-13.283,108.683-35.746v30.027V463.2
+		c-32.64,16.572-69.567,25.913-108.683,25.913c-132.693,0-240.264-107.56-240.264-240.253S123.314,8.596,256.007,8.596
+		S496.26,116.167,496.26,248.86z"/>
+	<polygon style="fill:#E7ECED;" points="410.453,380.43 410.453,426.193 364.69,426.193 364.69,396.166 364.69,380.43 	"/>
+</g>
+<g>
+	<polygon style="fill:#AFB6BB;" points="364.69,463.2 364.69,426.193 410.453,426.193 410.453,431.912 410.453,466.237 
+		364.69,466.237 	"/>
+	<polygon style="fill:#AFB6BB;" points="364.69,312.353 364.69,294.623 376.139,294.623 399.015,294.623 410.453,294.623 
+		410.453,346.105 410.453,380.43 364.69,380.43 	"/>
+</g>
+<polygon style="fill:#F4661E;" points="380.7,231.692 404.734,231.692 399.015,294.623 376.139,294.623 370.409,231.692 "/>
+<path d="M431.971,72.891C384.971,25.887,322.48,0,256.007,0S127.041,25.887,80.037,72.891S7.147,182.388,7.147,248.86
+	s25.887,128.964,72.89,175.965c47.003,47,109.498,72.884,175.97,72.884c36.544,0,71.599-7.703,104.354-22.876h18.62v37.169h17.191
+	v-37.169h22.876v-39.144c24.701-22.784,45.569-50.824,60.466-81.351c16.578-33.974,25.34-70.448,25.34-105.477
+	C504.855,182.387,478.971,119.893,431.971,72.891z M401.858,371.834h-28.573v-68.616h28.573V371.834z M391.165,286.027h-7.178
+	l-4.165-45.74h15.498L391.165,286.027z M366.726,286.027h-10.632v22.644v1.305c-21.239,34.687-59.376,56.138-100.087,56.138
+	c-64.655,0-117.255-52.6-117.255-117.257s52.601-117.255,117.255-117.255c55.005,0,102.528,38.695,114.399,91.492h-9.412
+	L366.726,286.027z M401.858,389.026v28.572h-28.573v-28.572H401.858z M408.426,286.027l5.72-62.931h-26.168
+	c-5.65-29.029-20.808-55.517-43.211-75.224c-24.53-21.576-56.051-33.459-88.762-33.459c-74.134,0-134.447,60.312-134.447,134.447
+	c0,74.135,60.312,134.448,134.447,134.448c38.417,0,74.826-16.664,100.087-44.728v53.179
+	c-29.41,20.658-63.919,31.559-100.087,31.559c-96.202,0-174.468-78.261-174.468-174.458c0-96.201,78.266-174.467,174.468-174.467
+	c96.195,0,174.456,78.266,174.456,174.467c0,21.39-3.913,42.405-11.415,62.11v-24.942H408.426z M373.285,457.641v-22.853h28.573
+	v22.852h-28.573V457.641z M464.064,346.798c-11.556,23.684-26.942,45.765-45.015,64.778v-61.978
+	c18.709-30.207,28.606-65.006,28.606-100.738c0-105.681-85.973-191.658-191.648-191.658c-105.681,0-191.659,85.978-191.659,191.658
+	c0,105.676,85.978,191.649,191.659,191.649c35.752,0,70.031-9.702,100.087-28.183v42.28v3.255
+	c-31.32,15.038-64.966,22.658-100.087,22.658c-127.742,0-231.669-103.921-231.669-231.657
+	c0-127.742,103.927-231.669,231.669-231.669c127.736,0,231.656,103.927,231.656,231.669
+	C487.664,281.292,479.504,315.157,464.064,346.798z"/>
+<path d="M256.007,165.895c-45.747,0-82.965,37.218-82.965,82.965c0,45.74,37.218,82.953,82.965,82.953
+	c45.74,0,82.952-37.213,82.952-82.953C338.96,203.113,301.747,165.895,256.007,165.895z M256.007,314.622
+	c-36.268,0-65.774-29.5-65.774-65.762c0-36.268,29.506-65.774,65.774-65.774c36.261,0,65.761,29.506,65.761,65.774
+	C321.769,285.121,292.269,314.622,256.007,314.622z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/packages/core/test_resources/pubspec_assets.yaml b/packages/core/test_resources/pubspec_assets.yaml
@@ -17,6 +17,7 @@ flutter:
     - assets/images/icons/fuchsia.svg
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.json
     - pictures/chip5.jpg
     - assets/flare/
diff --git a/packages/core/test_resources/pubspec_assets_camel_case.yaml b/packages/core/test_resources/pubspec_assets_camel_case.yaml
@@ -16,5 +16,6 @@ flutter:
     - assets/images/icons/fuchsia.svg
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.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
@@ -13,5 +13,6 @@ flutter:
     - assets/images/icons/fuchsia.svg
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.json
     - pictures/chip5.jpg
diff --git a/packages/core/test_resources/pubspec_assets_package_parameter.yaml b/packages/core/test_resources/pubspec_assets_package_parameter.yaml
@@ -9,4 +9,5 @@ flutter_gen:
 flutter:
   assets:
     - assets/images/chip3/chip3.jpg
+    - assets/images/icons/dart@test.svg
     - assets/images/icons/fuchsia.svg
diff --git a/packages/core/test_resources/pubspec_assets_package_parameter_disable_null_safety.yaml b/packages/core/test_resources/pubspec_assets_package_parameter_disable_null_safety.yaml
@@ -9,4 +9,5 @@ flutter_gen:
 flutter:
   assets:
     - assets/images/chip3/chip3.jpg
+    - assets/images/icons/dart@test.svg
     - assets/images/icons/fuchsia.svg
diff --git a/packages/core/test_resources/pubspec_assets_snake_case.yaml b/packages/core/test_resources/pubspec_assets_snake_case.yaml
@@ -16,5 +16,6 @@ flutter:
     - assets/images/icons/fuchsia.svg
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.json
     - pictures/chip5.jpg
diff --git a/packages/core/test_resources/pubspec_assets_svg_integrations.yaml b/packages/core/test_resources/pubspec_assets_svg_integrations.yaml
@@ -9,4 +9,5 @@ flutter_gen:
 
 flutter:
   assets:
+    - assets/images/icons/dart@test.svg
     - assets/images/icons/fuchsia.svg
diff --git a/packages/core/test_resources/pubspec_normal.yaml b/packages/core/test_resources/pubspec_normal.yaml
@@ -23,6 +23,7 @@ flutter:
     - assets/images/icons/fuchsia.svg
     - assets/images/icons/kmm.svg
     - assets/images/icons/paint.svg
+    - assets/images/icons/dart@test.svg
     - assets/json/fruits.json
     - pictures/chip5.jpg
   fonts:
