Additional metadata fixes

src/LLTSharp/LLTParser.cs

@@ -699,6 +699,7 @@ private static void DeclareMainRules(ParserBuilder builder)
 				{
 					var obj = v.GetValue<TemplateDictionaryAccessor>(2);
 					var metadata = new List<IMetadata>();
+					var additionalMetadata = new AdditionalMetadata();
 
 					foreach (var pair in obj.Dictionary)
 					{
@@ -717,11 +718,14 @@ private static void DeclareMainRules(ParserBuilder builder)
 								metadata.Add(new VersionMetadata((int)((double)pair.Value.GetValue())));
 								break;
 							default:
-								metadata.Add(new AdditionalMetadata(pair.Key, pair.Value.GetValue()));
+								additionalMetadata.Set(pair.Key, pair.Value.GetValue());
 								break;
 						}
 					}
 
+					if (additionalMetadata.Count > 0)
+						metadata.Add(additionalMetadata.ToImmutable());
+
 					return new MetadataCollection(metadata);
 				});
 

src/LLTSharp/LLTSharp.csproj

@@ -8,7 +8,7 @@
 
 	<PropertyGroup>
 		<PackageId>LLTSharp</PackageId>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Authors>Roman K.</Authors>
 		<Company>RomeCore</Company>
 		<Product>LLTSharp</Product>

src/LLTSharp/Metadata/IAdditionalMetadata.cs

@@ -10,13 +10,21 @@ namespace LLTSharp.Metadata
 	/// </summary>
 	public interface IAdditionalMetadata : IMetadata, IDynamicMetaObjectProvider
 	{
-	}
+		/// <summary>
+		/// Gets the value associated with the specified key.
+		/// </summary>
+		/// <typeparam name="T">The type to convert the value to.</typeparam>
+		/// <param name="key">The key of the value to get.</param>
+		/// <returns>The converted value or default(T) if not found.</returns>
+		T Get<T>(string key);
 
-	public static partial class MetadataExtensions
-	{
-		public static IAdditionalMetadata? TryGetAdditionalMetadata(this IMetadataProvider provider)
-		{
-			return provider.Metadata.TryGet<IAdditionalMetadata>();
-		}
+		/// <summary>
+		/// Tries to get the value associated with the specified key.
+		/// </summary>
+		/// <typeparam name="T">The type to convert the value to.</typeparam>
+		/// <param name="key">The key of the value to get.</param>
+		/// <param name="value">When this method returns, contains the value if found; otherwise, default(T).</param>
+		/// <returns>true if the key was found; otherwise, false.</returns>
+		bool TryGet<T>(string key, out T value);
 	}
 }

src/LLTSharp/Metadata/MetadataExtensions.cs

@@ -26,5 +26,18 @@ public static MetadataCollection ToMetadataCollection<T>(this IEnumerable<T> enu
 		{
 			return new MetadataCollection(enumerable.Cast<IMetadata>());
 		}
+
+		public static T? TryGetAdditional<T>(this IMetadataCollection collection, string key)
+		{
+			foreach (var metadata in collection.GetAll<IAdditionalMetadata>())
+			{
+				if (metadata.TryGet<T>(key, out var result))
+				{
+					return result;
+				}
+			}
+
+			return default;
+		}
 	}
 }