Merge pull request #1 from AnnulusGames/change-property-name-arg

Change: PropertyName to constructor argument

Author: nuskey8

README.md

@@ -97,6 +97,26 @@ void Awake()
 }
 ```
 
+It is also possible to specify the property name of the generated cache. If not specified, the class name of the target component converted to lower camel case will be used.
+
+```cs
+using UnityEngine;
+using ComponentCacheGenerator;
+
+[GenerateComponentCache(typeof(FooComponent), "foo")]
+[GenerateComponentCache(typeof(BarComponent), "bar")]
+[GenerateComponentCache(typeof(BazComponent), "baz")]
+public partial class SomeBehaviour : MonoBehaviour
+{
+    void Update()
+    {
+        foo.Foo();
+        bar.Bar();
+        bazCBaz();
+    }
+}
+```
+
 ## Generation Options
 
 You can specify generation code settings by specifying values for properties in the `[GenerateComponentCache]` attribute.
@@ -105,7 +125,6 @@ You can specify generation code settings by specifying values for properties in
 | - | - |
 | SearchScope | Specifies the scope to search for components. If multiple are specified, the search will be performed in the order of Self > Children > Parent. (Default is Self) |
 | IsRequired | If IsRequired is true, an exception will be thrown if the component is not found when `CacheComponents()` is called. If the search scope is Self, `[RequireComponent]` attribute will be automatically generated. (Default is true) |
-| PropertyName | Specifies the name of the generated property. If not specified, the lower camel case version of the target component's class name will be used. |
 
 ## License
 

README_JA.md

@@ -97,6 +97,26 @@ void Awake()
 }
 ```
 
+また、生成されるキャッシュのプロパティ名を指定することも可能です。指定がない場合には対象のコンポーネントのクラス名をlower camel caseに変換した名前が使用されます。
+
+```cs
+using UnityEngine;
+using ComponentCacheGenerator;
+
+[GenerateComponentCache(typeof(FooComponent), "foo")]
+[GenerateComponentCache(typeof(BarComponent), "bar")]
+[GenerateComponentCache(typeof(BazComponent), "baz")]
+public partial class SomeBehaviour : MonoBehaviour
+{
+    void Update()
+    {
+        foo.Foo();
+        bar.Bar();
+        bazCBaz();
+    }
+}
+```
+
 ## 生成オプション
 
 `[GenerateComponentCache]`属性のプロパティの値を指定することで、生成コードの設定を行うことが可能です。
@@ -105,7 +125,6 @@ void Awake()
 | - | - |
 | SearchScope | コンポーネントを探索する範囲を指定します。複数指定された場合はSelf > Children > Parentの順番で探索を行います。(デフォルトはSelf) |
 | IsRequired | IsRequiredがtrueの場合、`CacheComponents()`でコンポーネントが見つからなかったときに例外をスローします。また、探索範囲がSelfの場合は`[RequireComponent]`属性を自動で生成します。(デフォルトはtrue) |
-| PropertyName | 生成するプロパティの名前を指定します。指定がない場合には対象のコンポーネントのクラス名をlower camel caseに変換した名前が使用されます。 |
 
 ## ライセンス
 

src/ComponentCacheGenerator.SourceGenerator/ComponentCacheGenerator.cs

@@ -28,14 +28,16 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         context.RegisterSourceOutput(source, Emit);
     }
 
-    static void GetAttributeParameters(AttributeData attr, out INamedTypeSymbol targetType, out ComponentSearchScope searchScope, out bool isRequired, out string? propertyName)
+    static void GetAttributeParameters(AttributeData attr, out INamedTypeSymbol targetType, out string? propertyName, out ComponentSearchScope searchScope, out bool isRequired)
     {
         targetType = (INamedTypeSymbol)attr.ConstructorArguments[0].Value!;
+        propertyName = attr.ConstructorArguments.Length == 2
+            ? (string)attr.ConstructorArguments[1].Value!
+            : null;
 
         var properties = attr.NamedArguments.ToDictionary(kv => kv.Key, kv => kv.Value);
         searchScope = properties.TryGetValue("SearchScope", out var searchScopeConstant) ? (ComponentSearchScope)searchScopeConstant.Value! : ComponentSearchScope.Self;
         isRequired = properties.TryGetValue("IsRequired", out var isRequiredConstant) ? (bool)isRequiredConstant.Value! : true;
-        propertyName = properties.TryGetValue("PropertyName", out var propertyNameConstant) ? (string)propertyNameConstant.Value! : null;
     }
 
     static bool Verify(SourceProductionContext context, TypeDeclarationSyntax typeSyntax, INamedTypeSymbol targetType)
@@ -99,7 +101,7 @@ private void Awake()
 
         foreach (var attribute in source.Attributes)
         {
-            GetAttributeParameters(attribute, out var targetType, out var searchScope, out var isRequired, out var propertyName);
+            GetAttributeParameters(attribute, out var targetType, out var propertyName, out var searchScope, out var isRequired);
             var targetTypeFullName = targetType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
             var cachePropertyName = propertyName ?? MemberNames.ClassNameToFieldName(targetType.Name);
             cachePropertyCode.AppendLine($"private {targetTypeFullName} {cachePropertyName} {{ get; set; }}");

src/ComponentCacheGenerator/Assets/ComponentCacheGenerator/Generator/ComponentCacheGenerator.SourceGenerator.dll

@@ -18,9 +18,16 @@ public GenerateComponentCacheAttribute(Type componentType)
             ComponentType = componentType;
         }
 
-        public Type ComponentType { get; }
+        public GenerateComponentCacheAttribute(Type componentType, string propertyName)
+        {
+            ComponentType = componentType;
+            PropertyName = propertyName;
+        }
+
+        public Type ComponentType { get; } = null;
+        public string PropertyName { get; } = null;
+
         public ComponentSearchScope SearchScope { get; set; } = ComponentSearchScope.Self;
         public bool IsRequired { get; set; } = true;
-        public string PropertyName { get; set; } = null;
     }
 }

src/ComponentCacheGenerator/Assets/ComponentCacheGenerator/Runtime/GenerateComponentCacheAttribute.cs

@@ -1,8 +1,8 @@
 using UnityEngine;
 using ComponentCacheGenerator;
 
-[GenerateComponentCache(typeof(Rigidbody), PropertyName = "rb")]
-[GenerateComponentCache(typeof(SampleComponent), PropertyName = "sample", SearchScope = ComponentSearchScope.Children)]
+[GenerateComponentCache(typeof(Rigidbody), "rb")]
+[GenerateComponentCache(typeof(SampleComponent), "sample", SearchScope = ComponentSearchScope.Children)]
 public partial class Sandbox : MonoBehaviour
 {
     void FixedUpdate()