testing

.github/workflows/release.yml

@@ -27,11 +27,11 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Build protodec
-        run:  dotnet publish --configuration Release --runtime ${{ matrix.runtime }} /p:VersionPrefix=${{ github.ref_name }} /p:ContinuousIntegrationBuild=true
+        run:  dotnet publish --configuration Release --runtime ${{ matrix.runtime }} /p:Version=${{ github.ref_name }} /p:ContinuousIntegrationBuild=true
 
       - name: Pack LibProtodec
         if:   matrix.os == 'ubuntu-latest'
-        run:  dotnet pack --configuration Release /p:VersionPrefix=${{ github.ref_name }} /p:ContinuousIntegrationBuild=true
+        run:  dotnet pack --configuration Release /p:Version=${{ github.ref_name }} /p:ContinuousIntegrationBuild=true
 
       - name: Release
         uses: softprops/action-gh-release@v1

README.md

@@ -10,6 +10,7 @@ Arguments:
   target_assembly_path  Either the path to the target assembly or a directory of assemblies, all of which be parsed.
   out_path              An existing directory to output into individual files, otherwise output to a single file.
 Options:
+  --debug                                                     Drops the minimum log level to Debug.
   --parse_service_servers                                     Parses gRPC service definitions from server classes.
   --parse_service_clients                                     Parses gRPC service definitions from client classes.
   --skip_enums                                                Skip parsing enums and replace references to them with int32.

src/LibProtodec/AssemblyInspector.cs

@@ -1,91 +0,0 @@
-// Copyright © 2023-2024 Xpl0itR
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace LibProtodec;
-
-public sealed class AssemblyInspector : IDisposable
-{
-    public readonly MetadataLoadContext AssemblyContext;
-    public readonly IReadOnlyList<Type> LoadedTypes;
-
-    public AssemblyInspector(string assemblyPath)
-    {
-        bool   isFile      = File.Exists(assemblyPath);
-        string assemblyDir = isFile
-            ? Path.GetDirectoryName(assemblyPath)!
-            : assemblyPath;
-
-        PermissiveAssemblyResolver assemblyResolver = new(
-            Directory.EnumerateFiles(assemblyDir, searchPattern: "*.dll"));
-
-        AssemblyContext = new MetadataLoadContext(assemblyResolver);
-        LoadedTypes     = isFile
-            ? AssemblyContext.LoadFromAssemblyPath(assemblyPath).GetTypes()
-            : assemblyResolver.AssemblyPathLookup.Values.SelectMany(path => AssemblyContext.LoadFromAssemblyPath(path).GetTypes()).ToList();
-    }
-
-    public IEnumerable<Type> GetProtobufMessageTypes()
-    {
-        Type? iMessage = LoadedTypes.SingleOrDefault(static type => type?.FullName == "Google.Protobuf.IMessage", null)
-                      ?? AssemblyContext.LoadFromAssemblyName("Google.Protobuf")
-                                        .GetType("Google.Protobuf.IMessage");
-
-        return LoadedTypes.Where(
-            type => type is { IsNested: false, IsSealed: true }
-                 && type.Namespace?.StartsWith("Google.Protobuf", StringComparison.Ordinal) != true
-                 && type.IsAssignableTo(iMessage));
-    }
-
-    public IEnumerable<Type> GetProtobufServiceClientTypes()
-    {
-        Type? clientBase = LoadedTypes.SingleOrDefault(static type => type?.FullName == "Grpc.Core.ClientBase", null)
-                        ?? AssemblyContext.LoadFromAssemblyName("Grpc.Core.Api")
-                                          .GetType("Grpc.Core.ClientBase");
-
-        return LoadedTypes.Where(
-            type => type is { IsNested: true, IsAbstract: false }
-                 && type.IsAssignableTo(clientBase));
-    }
-
-    public IEnumerable<Type> GetProtobufServiceServerTypes()
-    {
-        Type? bindServiceMethodAttribute = LoadedTypes.SingleOrDefault(static type => type?.FullName == "Grpc.Core.BindServiceMethodAttribute", null)
-                                        ?? AssemblyContext.LoadFromAssemblyName("Grpc.Core.Api")
-                                                          .GetType("Grpc.Core.BindServiceMethodAttribute");
-
-        return LoadedTypes.Where(
-            type => type is { IsNested: true, IsAbstract: true, DeclaringType: { IsNested: false, IsSealed: true, IsAbstract: true } }
-                 && type.GetCustomAttributesData().Any(attribute => attribute.AttributeType == bindServiceMethodAttribute));
-    }
-
-    public void Dispose() =>
-        AssemblyContext.Dispose();
-
-    /// <summary>
-    ///     An assembly resolver that uses paths to every assembly that may be loaded.
-    ///     The file name is expected to be the same as the assembly's simple name (casing ignored).
-    ///     PublicKeyToken, Version and CultureName are ignored.
-    /// </summary>
-    private sealed class PermissiveAssemblyResolver(IEnumerable<string> assemblyPaths) : MetadataAssemblyResolver
-    {
-        public readonly IReadOnlyDictionary<string, string> AssemblyPathLookup =
-            assemblyPaths.ToDictionary(
-                static path => Path.GetFileNameWithoutExtension(path),
-                StringComparer.OrdinalIgnoreCase);
-
-        /// <inheritdoc />
-        public override Assembly? Resolve(MetadataLoadContext mlc, AssemblyName assemblyName) =>
-            AssemblyPathLookup.TryGetValue(assemblyName.Name!, out string? assemblyPath)
-                ? mlc.LoadFromAssemblyPath(assemblyPath)
-                : null;
-    }
-}

src/LibProtodec/CilReader.cs

@@ -0,0 +1,67 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using SystemEx.Memory;
+
+namespace LibProtodec;
+
+public static class CilReader
+{
+    // Temporary AOT incompatible method to fill the dictionary, TODO: replace with a source generator
+    private static readonly Dictionary<int, OpCode> OpCodeLookup =
+        typeof(OpCodes).GetFields(BindingFlags.Public | BindingFlags.Static)
+                       .Select(field => (OpCode)field.GetValue(null)!)
+                       .ToDictionary(opCode => (int)(ushort)opCode.Value);
+
+    public static OpCode ReadCilOpCode(this ref MemoryReader reader, out int operandLength)
+    {
+        byte opCodeByte = reader.ReadByte();
+        int opCodeInt = opCodeByte == OpCodes.Prefix1.Value
+            ? (opCodeByte << 8) | reader.ReadByte()
+            : opCodeByte;
+
+        OpCode opCode = OpCodeLookup[opCodeInt];
+        operandLength = SizeOf(opCode.OperandType);
+
+        return opCode;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int SizeOf(OperandType operandType)
+    {
+        switch (operandType)
+        {
+            case OperandType.ShortInlineBrTarget:
+            case OperandType.ShortInlineI:
+            case OperandType.ShortInlineVar:
+                return 1;
+            case OperandType.InlineVar:
+                return 2;
+            case OperandType.InlineBrTarget:
+            case OperandType.InlineField:
+            case OperandType.InlineI:
+            case OperandType.InlineMethod:
+            case OperandType.InlineSig:
+            case OperandType.InlineString:
+            case OperandType.InlineSwitch:
+            case OperandType.InlineTok:
+            case OperandType.InlineType:
+            case OperandType.ShortInlineR:
+                return 4;
+            case OperandType.InlineI8:
+            case OperandType.InlineR:
+                return 8;
+            case OperandType.InlineNone:
+            default:
+                return 0;
+        }
+    }
+}

src/LibProtodec/LibProtodec.csproj

@@ -18,9 +18,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.5.24306.7" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
+    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.5.24306.7" />
-    <PackageReference Include="Xpl0itR.SystemEx" Version="1.1.0" />
+    <PackageReference Include="Xpl0itR.SystemEx" Version="1.2.0" />
   </ItemGroup>
 
 </Project>

src/LibProtodec/Loaders/CilAssemblyLoader.cs

@@ -0,0 +1,34 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Collections.Generic;
+using LibProtodec.Models.Cil;
+
+namespace LibProtodec.Loaders;
+
+public abstract class CilAssemblyLoader : IDisposable
+{
+    private ICilType? _iMessage;
+    private ICilType? _clientBase;
+    private ICilType? _bindServiceMethodAttribute;
+
+    // ReSharper disable once InconsistentNaming
+    public ICilType IMessage =>
+        _iMessage ??= FindType("Google.Protobuf.IMessage", "Google.Protobuf");
+
+    public ICilType ClientBase =>
+        _clientBase ??= FindType("Grpc.Core.ClientBase", "Grpc.Core.Api");
+
+    public ICilType BindServiceMethodAttribute =>
+        _bindServiceMethodAttribute ??= FindType("Grpc.Core.BindServiceMethodAttribute", "Grpc.Core.Api");
+
+    public IReadOnlyList<ICilType> LoadedTypes { get; protected init; }
+
+    public virtual void Dispose() { }
+
+    protected abstract ICilType FindType(string typeFullName, string assemblySimpleName);
+}

src/LibProtodec/Loaders/ClrAssemblyLoader.cs

@@ -0,0 +1,79 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using CommunityToolkit.Diagnostics;
+using LibProtodec.Models.Cil;
+using LibProtodec.Models.Cil.Clr;
+using Microsoft.Extensions.Logging;
+
+namespace LibProtodec.Loaders;
+
+public sealed class ClrAssemblyLoader : CilAssemblyLoader
+{
+    public readonly MetadataLoadContext LoadContext;
+
+    public ClrAssemblyLoader(string assemblyPath, ILogger? logger = null)
+    {
+        bool isFile = File.Exists(assemblyPath);
+        string assemblyDir = isFile
+            ? Path.GetDirectoryName(assemblyPath)!
+            : assemblyPath;
+
+        PermissiveAssemblyResolver assemblyResolver = new(
+            Directory.EnumerateFiles(assemblyDir, searchPattern: "*.dll"));
+        LoadContext = new MetadataLoadContext(assemblyResolver);
+        
+        IEnumerable<Type> allTypes = isFile
+            ? LoadContext.LoadFromAssemblyPath(assemblyPath).GetTypes()
+            : assemblyResolver.AssemblyPathLookup.Values
+                              .SelectMany(path => LoadContext.LoadFromAssemblyPath(path).GetTypes());
+
+        this.LoadedTypes = allTypes.Where(static type => type.GenericTypeArguments.Length == 0)
+                                   .Select(ClrType.GetOrCreate)
+                                   .ToList();
+
+        logger?.LogLoadedTypeAndAssemblyCount(this.LoadedTypes.Count, LoadContext.GetAssemblies().Count());
+    }
+
+    protected override ICilType FindType(string typeFullName, string assemblySimpleName)
+    {
+        ICilType? type = this.LoadedTypes.SingleOrDefault(type => type?.FullName == typeFullName, null);
+        if (type is not null)
+            return type;
+
+        Type? clrType = LoadContext.LoadFromAssemblyName(assemblySimpleName).GetType(typeFullName);
+        Guard.IsNotNull(clrType);
+
+        return ClrType.GetOrCreate(clrType);
+    }
+
+    public override void Dispose() =>
+        LoadContext.Dispose();
+
+    /// <summary>
+    ///     An assembly resolver that uses paths to every assembly that may be loaded.
+    ///     The file name is expected to be the same as the assembly's simple name (casing ignored).
+    ///     PublicKeyToken, Version and CultureName are ignored.
+    /// </summary>
+    private sealed class PermissiveAssemblyResolver(IEnumerable<string> assemblyPaths) : MetadataAssemblyResolver
+    {
+        public readonly IReadOnlyDictionary<string, string> AssemblyPathLookup =
+            assemblyPaths.ToDictionary(
+                static path => Path.GetFileNameWithoutExtension(path),
+                StringComparer.OrdinalIgnoreCase);
+
+        /// <inheritdoc />
+        public override Assembly? Resolve(MetadataLoadContext mlc, AssemblyName assemblyName) =>
+            AssemblyPathLookup.TryGetValue(assemblyName.Name!, out string? assemblyPath)
+                ? mlc.LoadFromAssemblyPath(assemblyPath)
+                : null;
+    }
+}

src/LibProtodec/LoggerMessages.cs

@@ -0,0 +1,86 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace LibProtodec;
+
+// ReSharper disable InconsistentNaming, StringLiteralTypo
+internal static partial class LoggerMessages
+{
+    [LoggerMessage(Level = LogLevel.Warning, Message = "Failed to locate corresponding id field; likely stripped or otherwise obfuscated.")]
+    internal static partial void LogFailedToLocateIdField(this ILogger logger);
+
+    [LoggerMessage(Level = LogLevel.Information, Message = "Loaded {typeCount} types from {assemblyCount} assemblies for parsing.")]
+    internal static partial void LogLoadedTypeAndAssemblyCount(this ILogger logger, int typeCount, int assemblyCount);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as enum \"{name}\".")]
+    internal static partial void LogParsedEnum(this ILogger logger, string name);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as field \"{name}\" with id \"{id}\".")]
+    internal static partial void LogParsedField(this ILogger logger, string name, int id);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as field \"{name}\" with id \"{id}\" of type \"{typeName}\".")]
+    internal static partial void LogParsedField(this ILogger logger, string name, int id, string typeName);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as message \"{name}\".")]
+    internal static partial void LogParsedMessage(this ILogger logger, string name);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as method \"{name}\" with request type \"{reqType}\" and response type \"{resType}\".")]
+    internal static partial void LogParsedMethod(this ILogger logger, string name, string reqType, string resType);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as oneof field \"{name}\".")]
+    internal static partial void LogParsedOneOfField(this ILogger logger, string name);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Parsed as service \"{name}\".")]
+    internal static partial void LogParsedService(this ILogger logger, string name);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Skipping duplicate method.")]
+    internal static partial void LogSkippingDuplicateMethod(this ILogger logger);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Skipping property without required NonUserCodeAttribute.")]
+    internal static partial void LogSkippingPropertyWithoutNonUserCodeAttribute(this ILogger logger);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Skipping method without required GeneratedCodeAttribute.")]
+    internal static partial void LogSkippingMethodWithoutGeneratedCodeAttribute(this ILogger logger);
+
+    internal static IDisposable? BeginScopeParsingEnum(this ILogger logger, string typeName) =>
+        __BeginScopeParsingEnumCallback(logger, typeName);
+
+    internal static IDisposable? BeginScopeParsingField(this ILogger logger, string name) =>
+        __BeginScopeParsingFieldCallback(logger, name);
+
+    internal static IDisposable? BeginScopeParsingMessage(this ILogger logger, string name) =>
+        __BeginScopeParsingMessageCallback(logger, name);
+
+    internal static IDisposable? BeginScopeParsingMethod(this ILogger logger, string name) =>
+        __BeginScopeParsingMethodCallback(logger, name);
+
+    internal static IDisposable? BeginScopeParsingProperty(this ILogger logger, string name, string typeName) =>
+        __BeginScopeParsingPropertyCallback(logger, name, typeName);
+
+    internal static IDisposable? BeginScopeParsingService(this ILogger logger, string typeName) =>
+        __BeginScopeParsingServiceCallback(logger, typeName);
+
+    private static readonly Func<ILogger, string, IDisposable?> __BeginScopeParsingEnumCallback =
+        LoggerMessage.DefineScope<string>("Parsing enum from type \"{typeName}\"");
+
+    private static readonly Func<ILogger, string, IDisposable?> __BeginScopeParsingFieldCallback =
+        LoggerMessage.DefineScope<string>("Parsing field \"{name}\"");
+
+    private static readonly Func<ILogger, string, IDisposable?> __BeginScopeParsingMessageCallback =
+        LoggerMessage.DefineScope<string>("Parsing message from type \"{name}\"");
+
+    private static readonly Func<ILogger, string, IDisposable?> __BeginScopeParsingMethodCallback =
+        LoggerMessage.DefineScope<string>("Parsing method \"{name}\"");
+
+    private static readonly Func<ILogger, string, string, IDisposable?> __BeginScopeParsingPropertyCallback =
+        LoggerMessage.DefineScope<string, string>("Parsing property \"{name}\" of type \"{typeName}\"");
+
+    private static readonly Func<ILogger, string, IDisposable?> __BeginScopeParsingServiceCallback =
+        LoggerMessage.DefineScope<string>("Parsing service from type \"{typeName}\"");
+}

src/LibProtodec/Models/Cil/Clr/ClrAttribute.cs

@@ -0,0 +1,43 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public sealed class ClrAttribute(CustomAttributeData clrAttribute) : ICilAttribute
+{
+    private ICilType?  _type;
+    private object?[]? _constructorArgumentValues;
+
+    public ICilType Type =>
+        _type ??= ClrType.GetOrCreate(
+            clrAttribute.AttributeType);
+
+    public IList<object?> ConstructorArgumentValues
+    {
+        get
+        {
+            if (_constructorArgumentValues is null)
+            {
+                IList<CustomAttributeTypedArgument> args = clrAttribute.ConstructorArguments;
+
+                _constructorArgumentValues = args.Count < 1
+                    ? Array.Empty<object>()
+                    : new object[args.Count];
+
+                for (int i = 0; i < args.Count; i++)
+                {
+                    _constructorArgumentValues[i] = args[i].Value;
+                }
+            }
+
+            return _constructorArgumentValues;
+        }
+    }
+}

src/LibProtodec/Models/Cil/Clr/ClrField.cs

@@ -0,0 +1,24 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Reflection;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public sealed class ClrField(FieldInfo clrField) : ClrMember(clrField), ICilField
+{
+    public object? ConstantValue =>
+        clrField.GetRawConstantValue();
+
+    public bool IsLiteral =>
+        clrField.IsLiteral;
+
+    public bool IsPublic =>
+        clrField.IsPublic;
+
+    public bool IsStatic =>
+        clrField.IsStatic;
+}

src/LibProtodec/Models/Cil/Clr/ClrMember.cs

@@ -0,0 +1,50 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public abstract class ClrMember(MemberInfo clrMember)
+{
+    private ICilAttribute[]? _customAttributes;
+
+    public string Name =>
+        clrMember.Name;
+
+    public bool IsInherited =>
+        clrMember.DeclaringType != clrMember.ReflectedType;
+
+    public ICilType? DeclaringType =>
+        clrMember.DeclaringType is null
+            ? null
+            : ClrType.GetOrCreate(
+                clrMember.DeclaringType);
+
+    public IList<ICilAttribute> CustomAttributes
+    {
+        get
+        {
+            if (_customAttributes is null)
+            {
+                IList<CustomAttributeData> attributes = clrMember.GetCustomAttributesData();
+
+                _customAttributes = attributes.Count < 1
+                    ? Array.Empty<ICilAttribute>()
+                    : new ICilAttribute[attributes.Count];
+
+                for (int i = 0; i < attributes.Count; i++)
+                {
+                    _customAttributes[i] = new ClrAttribute(attributes[i]);
+                }
+            }
+
+            return _customAttributes;
+        }
+    }
+}

src/LibProtodec/Models/Cil/Clr/ClrMethod.cs

@@ -0,0 +1,43 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+using System.Reflection;
+using CommunityToolkit.Diagnostics;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public sealed class ClrMethod(MethodInfo clrMethod) : ClrMember(clrMethod), ICilMethod
+{
+    public bool IsConstructor =>
+        clrMethod.IsConstructor;
+
+    public bool IsPublic =>
+        clrMethod.IsPublic;
+
+    public bool IsStatic =>
+        clrMethod.IsStatic;
+
+    public bool IsVirtual =>
+        clrMethod.IsVirtual;
+
+    public ICilType ReturnType =>
+        ClrType.GetOrCreate(
+            clrMethod.ReturnType);
+
+    public IEnumerable<ICilType> GetParameterTypes()
+    {
+        foreach (ParameterInfo parameter in clrMethod.GetParameters())
+        {
+            yield return ClrType.GetOrCreate(
+                parameter.ParameterType);
+        }
+    }
+
+    public byte[] GetMethodBodyILAsByteArray() =>
+        clrMethod.GetMethodBody()?.GetILAsByteArray()
+     ?? ThrowHelper.ThrowNotSupportedException<byte[]>();
+}

src/LibProtodec/Models/Cil/Clr/ClrModule.cs

@@ -0,0 +1,27 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public sealed class ClrModule : ICilModule
+{
+    private readonly Module _module;
+
+    private ClrModule(Module module) =>
+        _module = module;
+
+    public string ResolveFieldName(int token) =>
+        _module.ResolveField(token).Name;
+
+    public string ResolveMethodName(int token) =>
+        _module.ResolveMethod(token).Name;
+
+
+    private static readonly ConcurrentDictionary<string, ClrModule> ModuleLookup = [];
+
+    public static ICilModule GetOrCreate(Module clrModule) =>
+        ModuleLookup.GetOrAdd(
+            clrModule.FullyQualifiedName,
+            static (_, clrModule) => new ClrModule(clrModule),
+            clrModule);
+}

src/LibProtodec/Models/Cil/Clr/ClrProperty.cs

@@ -0,0 +1,38 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Reflection;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public sealed class ClrProperty(PropertyInfo clrProperty) : ClrMember(clrProperty), ICilProperty
+{
+    private readonly MethodInfo? _getterInfo = clrProperty.GetMethod;
+    private readonly MethodInfo? _setterInfo = clrProperty.SetMethod;
+
+    private ClrMethod? _getter;
+    private ClrMethod? _setter;
+
+    public bool CanRead =>
+        _getterInfo is not null;
+
+    public bool CanWrite =>
+        _setterInfo is not null;
+
+    public ICilMethod? Getter =>
+        _getterInfo is null
+            ? null
+            : _getter ??= new ClrMethod(_getterInfo);
+
+    public ICilMethod? Setter =>
+        _setterInfo is null
+            ? null
+            : _setter ??= new ClrMethod(_setterInfo);
+
+    public ICilType Type =>
+        ClrType.GetOrCreate(
+            clrProperty.PropertyType);
+}

src/LibProtodec/Models/Cil/Clr/ClrType.cs

@@ -0,0 +1,131 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reflection;
+using CommunityToolkit.Diagnostics;
+
+namespace LibProtodec.Models.Cil.Clr;
+
+public sealed class ClrType : ClrMember, ICilType
+{
+    private const BindingFlags Everything = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+
+    private readonly Type _clrType;
+    private ICilType[]? _genericTypeArguments;
+
+    private ClrType(Type clrType) : base(clrType) =>
+        _clrType = clrType;
+
+    public string FullName =>
+        _clrType.FullName ?? _clrType.Name;
+
+    public string? Namespace =>
+        _clrType.Namespace;
+
+    public string DeclaringAssemblyName =>
+        _clrType.Assembly.FullName!;
+
+    public ICilModule DeclaringModule =>
+        ClrModule.GetOrCreate(
+            _clrType.Module);
+
+    public ICilType? BaseType =>
+        _clrType.BaseType is null
+            ? null
+            : GetOrCreate(
+                _clrType.BaseType);
+
+    public bool IsAbstract =>
+        _clrType.IsAbstract;
+
+    public bool IsClass =>
+        _clrType.IsClass;
+
+    public bool IsEnum =>
+        _clrType.IsEnum;
+
+    public bool IsNested =>
+        _clrType.IsNested;
+
+    public bool IsSealed =>
+        _clrType.IsSealed;
+
+    public IList<ICilType> GenericTypeArguments
+    {
+        get
+        {
+            if (_genericTypeArguments is null)
+            {
+                Type[] args = _clrType.GenericTypeArguments;
+
+                _genericTypeArguments = args.Length < 1
+                    ? Array.Empty<ICilType>()
+                    : new ICilType[args.Length];
+
+                for (int i = 0; i < args.Length; i++)
+                {
+                    _genericTypeArguments[i] = GetOrCreate(args[i]);
+                }
+            }
+
+            return _genericTypeArguments;
+        }
+    }
+
+    public IEnumerable<ICilField> GetFields()
+    {
+        foreach (FieldInfo field in _clrType.GetFields(Everything))
+        {
+            yield return new ClrField(field);
+        }
+    }
+
+    public IEnumerable<ICilMethod> GetMethods()
+    {
+        foreach (MethodInfo method in _clrType.GetMethods(Everything))
+        {
+            yield return new ClrMethod(method);
+        }
+    }
+
+    public IEnumerable<ICilType> GetNestedTypes()
+    {
+        foreach (Type type in _clrType.GetNestedTypes(Everything))
+        {
+            yield return GetOrCreate(type);
+        }
+    }
+
+    public IEnumerable<ICilProperty> GetProperties()
+    {
+        foreach (PropertyInfo property in _clrType.GetProperties(Everything))
+        {
+            yield return new ClrProperty(property);
+        }
+    }
+
+    public bool IsAssignableTo(ICilType type)
+    {
+        if (type is ClrType clrType)
+        {
+            return _clrType.IsAssignableTo(clrType._clrType);
+        }
+
+        return ThrowHelper.ThrowNotSupportedException<bool>();
+    }
+
+
+    private static readonly ConcurrentDictionary<string, ClrType> TypeLookup = [];
+
+    public static ICilType GetOrCreate(Type clrType) =>
+        TypeLookup.GetOrAdd(
+            clrType.FullName ?? clrType.Name,
+            static (_, clrType) => new ClrType(clrType),
+            clrType);
+}

src/LibProtodec/Models/Cil/ICilAttribute.cs

@@ -0,0 +1,16 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+
+namespace LibProtodec.Models.Cil;
+
+public interface ICilAttribute
+{
+    ICilType Type { get; }
+
+    IList<object?> ConstructorArgumentValues { get; }
+}

src/LibProtodec/Models/Cil/ICilField.cs

@@ -0,0 +1,22 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+
+namespace LibProtodec.Models.Cil;
+
+public interface ICilField
+{
+    string Name { get; }
+
+    object? ConstantValue { get; }
+
+    IList<ICilAttribute> CustomAttributes { get; }
+
+    bool IsLiteral { get; }
+    bool IsPublic  { get; }
+    bool IsStatic  { get; }
+}

src/LibProtodec/Models/Cil/ICilMethod.cs

@@ -0,0 +1,28 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+
+namespace LibProtodec.Models.Cil;
+
+public interface ICilMethod
+{
+    string Name { get; }
+
+    bool IsConstructor { get; }
+    bool IsInherited   { get; }
+    bool IsPublic      { get; }
+    bool IsStatic      { get; }
+    bool IsVirtual     { get; }
+
+    ICilType ReturnType { get; }
+
+    IList<ICilAttribute> CustomAttributes { get; }
+
+    IEnumerable<ICilType> GetParameterTypes();
+
+    byte[] GetMethodBodyILAsByteArray();
+}

src/LibProtodec/Models/Cil/ICilModule.cs

@@ -0,0 +1,14 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+namespace LibProtodec.Models.Cil;
+
+public interface ICilModule
+{
+    string ResolveFieldName(int token);
+
+    string ResolveMethodName(int token);
+}

src/LibProtodec/Models/Cil/ICilProperty.cs

@@ -0,0 +1,24 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+
+namespace LibProtodec.Models.Cil;
+
+public interface ICilProperty
+{
+    string   Name { get; }
+    ICilType Type { get; }
+
+    bool IsInherited { get; }
+    bool CanRead     { get; }
+    bool CanWrite    { get; }
+
+    ICilMethod? Getter { get; }
+    ICilMethod? Setter { get; }
+
+    IList<ICilAttribute> CustomAttributes { get; }
+}

src/LibProtodec/Models/Cil/ICilType.cs

@@ -0,0 +1,41 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System.Collections.Generic;
+
+namespace LibProtodec.Models.Cil;
+
+public interface ICilType
+{
+    string  Name      { get; }
+    string  FullName  { get; }
+    string? Namespace { get; }
+
+    string     DeclaringAssemblyName { get; }
+    ICilModule DeclaringModule       { get; }
+    ICilType?  DeclaringType         { get; }
+    ICilType?  BaseType              { get; }
+
+    bool IsAbstract { get; }
+    bool IsClass    { get; }
+    bool IsEnum     { get; }
+    bool IsNested   { get; }
+    bool IsSealed   { get; }
+
+    IList<ICilType> GenericTypeArguments { get; }
+
+    IList<ICilAttribute> CustomAttributes { get; }
+
+    IEnumerable<ICilField> GetFields();
+
+    IEnumerable<ICilMethod> GetMethods();
+
+    IEnumerable<ICilType> GetNestedTypes();
+
+    IEnumerable<ICilProperty> GetProperties();
+
+    bool IsAssignableTo(ICilType type);
+}

src/LibProtodec/Models/Protobuf/Fields/EnumField.cs

@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-namespace LibProtodec.Models.Fields;
+namespace LibProtodec.Models.Protobuf.Fields;
 
 public sealed class EnumField
 {

src/LibProtodec/Models/Protobuf/Fields/MessageField.cs

@@ -5,28 +5,29 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 using System.IO;
-using LibProtodec.Models.TopLevels;
+using LibProtodec.Models.Protobuf.TopLevels;
-using LibProtodec.Models.Types;
+using LibProtodec.Models.Protobuf.Types;
 
-namespace LibProtodec.Models.Fields;
+namespace LibProtodec.Models.Protobuf.Fields;
 
-public sealed class MessageField
+public sealed class MessageField(Message declaringMessage)
 {
-    public required IType  Type { get; init; }
+    public required IProtobufType Type { get; init; }
     public required string        Name { get; init; }
     public required int           Id   { get; init; }
 
     public bool IsObsolete { get; init; }
     public bool HasHasProp { get; init; }
 
-    public void WriteTo(TextWriter writer, TopLevel topLevel, bool isOneOf)
+    public void WriteTo(TextWriter writer, bool isOneOf)
     {
         if (HasHasProp && !isOneOf && Type is not Repeated)
         {
             writer.Write("optional ");
         }
 
-        Protobuf.WriteTypeNameTo(writer, Type, topLevel);
+        writer.Write(
+            declaringMessage.QualifyTypeName(Type));
         writer.Write(' ');
         writer.Write(Name);
         writer.Write(" = ");

src/LibProtodec/Models/Protobuf/Fields/ServiceMethod.cs

@@ -5,22 +5,22 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 using System.CodeDom.Compiler;
-using LibProtodec.Models.TopLevels;
+using LibProtodec.Models.Protobuf.TopLevels;
-using LibProtodec.Models.Types;
+using LibProtodec.Models.Protobuf.Types;
 
-namespace LibProtodec.Models.Fields;
+namespace LibProtodec.Models.Protobuf.Fields;
 
-public sealed class ServiceMethod
+public sealed class ServiceMethod(Service declaringService)
 {
     public required string        Name         { get; init; }
-    public required IType  RequestType  { get; init; }
+    public required IProtobufType RequestType  { get; init; }
-    public required IType  ResponseType { get; init; }
+    public required IProtobufType ResponseType { get; init; }
 
     public bool IsRequestStreamed  { get; init; }
     public bool IsResponseStreamed { get; init; }
     public bool IsObsolete         { get; init; }
 
-    public void WriteTo(IndentedTextWriter writer, TopLevel topLevel)
+    public void WriteTo(IndentedTextWriter writer)
     {
         writer.Write("rpc ");
         writer.Write(Name);
@@ -31,7 +31,8 @@ public sealed class ServiceMethod
             writer.Write("stream ");
         }
 
-        Protobuf.WriteTypeNameTo(writer, RequestType, topLevel);
+        writer.Write(
+            declaringService.QualifyTypeName(RequestType));
         writer.Write(") returns (");
 
         if (IsResponseStreamed)
@@ -39,7 +40,8 @@ public sealed class ServiceMethod
             writer.Write("stream ");
         }
 
-        Protobuf.WriteTypeNameTo(writer, ResponseType, topLevel);
+        writer.Write(
+            declaringService.QualifyTypeName(ResponseType));
         writer.Write(')');
 
         if (IsObsolete)

src/LibProtodec/Models/Protobuf/Protobuf.cs

@@ -8,16 +8,14 @@ using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using LibProtodec.Models.TopLevels;
+using LibProtodec.Models.Protobuf.TopLevels;
-using LibProtodec.Models.Types;
 
-namespace LibProtodec.Models;
+namespace LibProtodec.Models.Protobuf;
 
 public sealed class Protobuf
 {
+    private string? _fileName;
     private HashSet<string>? _imports;
-    public  HashSet<string> Imports =>
-        _imports ??= [];
 
     public readonly List<TopLevel> TopLevels = [];
 
@@ -26,7 +24,10 @@ public sealed class Protobuf
     public string? Namespace    { get; init; }
 
     public string FileName =>
-        $"{TopLevels.FirstOrDefault()?.Name}.proto";
+        _fileName ??= $"{string.Join('_', TopLevels.Select(static topLevel => topLevel.Name))}.proto";
+
+    public HashSet<string> Imports =>
+        _imports ??= [];
 
     public void WriteTo(IndentedTextWriter writer)
     {
@@ -89,17 +90,4 @@ public sealed class Protobuf
 
         writer.WriteLine(';');
     }
-
-    public static void WriteTypeNameTo(TextWriter writer, IType type, TopLevel topLevel)
-    {
-        if (type is TopLevel { Parent: not null } typeTopLevel && typeTopLevel.Parent != topLevel)
-        {
-            writer.Write(
-                typeTopLevel.QualifyName(topLevel));
-        }
-        else
-        {
-            writer.Write(type.Name);
-        }
-    }
 }

src/LibProtodec/Models/Protobuf/TopLevels/Enum.cs

@@ -4,13 +4,13 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-global using Enum = LibProtodec.Models.TopLevels.Enum;
+global using Enum = LibProtodec.Models.Protobuf.TopLevels.Enum;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
-using LibProtodec.Models.Fields;
+using LibProtodec.Models.Protobuf.Fields;
-using LibProtodec.Models.Types;
+using LibProtodec.Models.Protobuf.Types;
 
-namespace LibProtodec.Models.TopLevels;
+namespace LibProtodec.Models.Protobuf.TopLevels;
 
 public sealed class Enum : TopLevel, INestableType
 {
@@ -23,7 +23,7 @@ public sealed class Enum : TopLevel, INestableType
         writer.WriteLine(" {");
         writer.Indent++;
 
-        if (ContainsDuplicateField)
+        if (ContainsDuplicateFieldId)
         {
             Protobuf.WriteOptionTo(writer, "allow_alias", "true");
         }
@@ -49,7 +49,7 @@ public sealed class Enum : TopLevel, INestableType
 
     public bool IsClosed { get; set; }
 
-    private bool ContainsDuplicateField
+    private bool ContainsDuplicateFieldId
     {
         get
         {

src/LibProtodec/Models/Protobuf/TopLevels/Message.cs

@@ -7,14 +7,14 @@
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Linq;
-using LibProtodec.Models.Fields;
+using LibProtodec.Models.Protobuf.Fields;
-using LibProtodec.Models.Types;
+using LibProtodec.Models.Protobuf.Types;
 
-namespace LibProtodec.Models.TopLevels;
+namespace LibProtodec.Models.Protobuf.TopLevels;
 
 public sealed class Message : TopLevel, INestableType
 {
-    public readonly Dictionary<string, int[]>         OneOfs = [];
+    public readonly Dictionary<string, List<int>>     OneOfs = [];
     public readonly Dictionary<int, MessageField>     Fields = [];
     public readonly Dictionary<string, INestableType> Nested = [];
 
@@ -37,10 +37,10 @@ public sealed class Message : TopLevel, INestableType
             if (oneOfs.Contains(field.Id))
                 continue;
 
-            field.WriteTo(writer, this, isOneOf: false);
+            field.WriteTo(writer, isOneOf: false);
         }
 
-        foreach ((string name, int[] fieldIds) in OneOfs)
+        foreach ((string name, List<int> fieldIds) in OneOfs)
         {
             // ReSharper disable once StringLiteralTypo
             writer.Write("oneof ");
@@ -50,7 +50,7 @@ public sealed class Message : TopLevel, INestableType
 
             foreach (int fieldId in fieldIds)
             {
-                Fields[fieldId].WriteTo(writer, this, isOneOf: true);
+                Fields[fieldId].WriteTo(writer, isOneOf: true);
             }
 
             writer.Indent--;

src/LibProtodec/Models/Protobuf/TopLevels/Service.cs

@@ -6,9 +6,9 @@
 
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
-using LibProtodec.Models.Fields;
+using LibProtodec.Models.Protobuf.Fields;
 
-namespace LibProtodec.Models.TopLevels;
+namespace LibProtodec.Models.Protobuf.TopLevels;
 
 public sealed class Service : TopLevel
 {
@@ -28,7 +28,7 @@ public sealed class Service : TopLevel
 
         foreach (ServiceMethod method in Methods)
         {
-            method.WriteTo(writer, this);
+            method.WriteTo(writer);
         }
 
         writer.Indent--;

src/LibProtodec/Models/Protobuf/TopLevels/TopLevel.cs

@@ -6,22 +6,28 @@
 
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
+using LibProtodec.Models.Protobuf.Types;
 
-namespace LibProtodec.Models.TopLevels;
+namespace LibProtodec.Models.Protobuf.TopLevels;
 
 public abstract class TopLevel
 {
     public required string Name { get; init; }
+
     public bool      IsObsolete { get; init; }
     public Protobuf? Protobuf   { get; set;  }
     public TopLevel? Parent     { get; set;  }
 
-    public string QualifyName(TopLevel topLevel)
+    public string QualifyTypeName(IProtobufType type)
     {
-        List<string> names = [Name];
+        if (type is not TopLevel { Parent: not null } typeTopLevel
+         || typeTopLevel.Parent == this)
+            return type.Name;
 
-        TopLevel? parent = Parent;
+        List<string> names = [typeTopLevel.Name];
-        while (parent is not null && parent != topLevel)
+
+        TopLevel? parent = typeTopLevel.Parent;
+        while (parent is not null && parent != this)
         {
             names.Add(parent.Name);
             parent = parent.Parent;

src/LibProtodec/Models/Protobuf/Types/INestableType.cs

@@ -4,9 +4,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-namespace LibProtodec.Models.Types;
+namespace LibProtodec.Models.Protobuf.Types;
 
-public interface INestableType : IType
+public interface INestableType : IProtobufType
 {
     Protobuf? Protobuf { get; }
 

src/LibProtodec/Models/Protobuf/Types/IProtobufType.cs

@@ -4,15 +4,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-namespace LibProtodec.Models.Types;
+namespace LibProtodec.Models.Protobuf.Types;
 
-public interface IType
+public interface IProtobufType
 {
     string Name { get; }
 }
-
-public sealed class External(string typeName) : IType
-{
-    public string Name =>
-        typeName;
-}

src/LibProtodec/Models/Protobuf/Types/Map.cs

@@ -4,9 +4,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-namespace LibProtodec.Models.Types;
+namespace LibProtodec.Models.Protobuf.Types;
 
-public sealed class Map(IType typeKey, IType typeVal) : IType
+public sealed class Map(IProtobufType typeKey, IProtobufType typeVal) : IProtobufType
 {
     public string Name =>
         $"map<{typeKey.Name}, {typeVal.Name}>";

src/LibProtodec/Models/Protobuf/Types/Repeated.cs

@@ -4,9 +4,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-namespace LibProtodec.Models.Types;
+namespace LibProtodec.Models.Protobuf.Types;
 
-public sealed class Repeated(IType type) : IType
+public sealed class Repeated(IProtobufType type) : IProtobufType
 {
     public string Name =>
         $"repeated {type.Name}";

src/LibProtodec/Models/Protobuf/Types/Scalar.cs

@@ -0,0 +1,30 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+namespace LibProtodec.Models.Protobuf.Types;
+
+// ReSharper disable StringLiteralTypo
+public sealed class Scalar(string typeName) : IProtobufType
+{
+    public string Name =>
+        typeName;
+
+    public static readonly IProtobufType Bool     = new Scalar("bool");
+    public static readonly IProtobufType Bytes    = new Scalar("bytes");
+    public static readonly IProtobufType Double   = new Scalar("double");
+    public static readonly IProtobufType Fixed32  = new Scalar("fixed32");
+    public static readonly IProtobufType Fixed64  = new Scalar("fixed64");
+    public static readonly IProtobufType Float    = new Scalar("float");
+    public static readonly IProtobufType Int32    = new Scalar("int32");
+    public static readonly IProtobufType Int64    = new Scalar("int64");
+    public static readonly IProtobufType SFixed32 = new Scalar("sfixed32");
+    public static readonly IProtobufType SFixed64 = new Scalar("sfixed64");
+    public static readonly IProtobufType SInt32   = new Scalar("sint32");
+    public static readonly IProtobufType SInt64   = new Scalar("sint64");
+    public static readonly IProtobufType String   = new Scalar("string");
+    public static readonly IProtobufType UInt32   = new Scalar("uint32");
+    public static readonly IProtobufType UInt64   = new Scalar("uint64");
+}

src/LibProtodec/Models/Protobuf/Types/WellKnown.cs

@@ -0,0 +1,45 @@
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+namespace LibProtodec.Models.Protobuf.Types;
+
+public sealed class WellKnown(string typeName, string fileName) : IProtobufType
+{
+    public string Name =>
+        typeName;
+
+    public string FileName =>
+        fileName;
+
+    public static readonly IProtobufType Any           = new WellKnown("google.protobuf.Any",           "google/protobuf/any.proto");
+    public static readonly IProtobufType Api           = new WellKnown("google.protobuf.Api",           "google/protobuf/api.proto");
+    public static readonly IProtobufType BoolValue     = new WellKnown("google.protobuf.BoolValue",     "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType BytesValue    = new WellKnown("google.protobuf.BytesValue",    "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType DoubleValue   = new WellKnown("google.protobuf.DoubleValue",   "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType Duration      = new WellKnown("google.protobuf.Duration",      "google/protobuf/duration.proto");
+    public static readonly IProtobufType Empty         = new WellKnown("google.protobuf.Empty",         "google/protobuf/empty.proto");
+    public static readonly IProtobufType Enum          = new WellKnown("google.protobuf.Enum",          "google/protobuf/type.proto");
+    public static readonly IProtobufType EnumValue     = new WellKnown("google.protobuf.EnumValue",     "google/protobuf/type.proto");
+    public static readonly IProtobufType Field         = new WellKnown("google.protobuf.Field",         "google/protobuf/type.proto");
+    public static readonly IProtobufType FieldMask     = new WellKnown("google.protobuf.FieldMask",     "google/protobuf/field_mask.proto");
+    public static readonly IProtobufType FloatValue    = new WellKnown("google.protobuf.FloatValue",    "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType Int32Value    = new WellKnown("google.protobuf.Int32Value",    "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType Int64Value    = new WellKnown("google.protobuf.Int64Value",    "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType ListValue     = new WellKnown("google.protobuf.ListValue",     "google/protobuf/struct.proto");
+    public static readonly IProtobufType Method        = new WellKnown("google.protobuf.Method",        "google/protobuf/api.proto");
+    public static readonly IProtobufType Mixin         = new WellKnown("google.protobuf.Mixin",         "google/protobuf/api.proto");
+    public static readonly IProtobufType NullValue     = new WellKnown("google.protobuf.NullValue",     "google/protobuf/struct.proto");
+    public static readonly IProtobufType Option        = new WellKnown("google.protobuf.Option",        "google/protobuf/type.proto");
+    public static readonly IProtobufType SourceContext = new WellKnown("google.protobuf.SourceContext", "google/protobuf/source_context.proto");
+    public static readonly IProtobufType StringValue   = new WellKnown("google.protobuf.StringValue",   "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType Struct        = new WellKnown("google.protobuf.Struct",        "google/protobuf/struct.proto");
+    public static readonly IProtobufType Syntax        = new WellKnown("google.protobuf.Syntax",        "google/protobuf/type.proto");
+    public static readonly IProtobufType Timestamp     = new WellKnown("google.protobuf.Timestamp",     "google/protobuf/timestamp.proto");
+    public static readonly IProtobufType Type          = new WellKnown("google.protobuf.Type",          "google/protobuf/type.proto");
+    public static readonly IProtobufType UInt32Value   = new WellKnown("google.protobuf.UInt32Value",   "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType UInt64Value   = new WellKnown("google.protobuf.UInt64Value",   "google/protobuf/wrappers.proto");
+    public static readonly IProtobufType Value         = new WellKnown("google.protobuf.Value",         "google/protobuf/struct.proto");
+}

src/LibProtodec/Models/Types/Scalar.cs

@@ -1,27 +0,0 @@
-// Copyright © 2024 Xpl0itR
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-namespace LibProtodec.Models.Types;
-
-// ReSharper disable StringLiteralTypo
-public static class Scalar
-{
-    public static readonly IType Bool     = new External("bool");
-    public static readonly IType Bytes    = new External("bytes");
-    public static readonly IType Double   = new External("double");
-    public static readonly IType Fixed32  = new External("fixed32");
-    public static readonly IType Fixed64  = new External("fixed64");
-    public static readonly IType Float    = new External("float");
-    public static readonly IType Int32    = new External("int32");
-    public static readonly IType Int64    = new External("int64");
-    public static readonly IType SFixed32 = new External("sfixed32");
-    public static readonly IType SFixed64 = new External("sfixed64");
-    public static readonly IType SInt32   = new External("sint32");
-    public static readonly IType SInt64   = new External("sint64");
-    public static readonly IType String   = new External("string");
-    public static readonly IType UInt32   = new External("uint32");
-    public static readonly IType UInt64   = new External("uint64");
-}

src/LibProtodec/Models/Types/WellKnown.cs

@@ -1,39 +0,0 @@
-// Copyright © 2024 Xpl0itR
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-namespace LibProtodec.Models.Types;
-
-public static class WellKnown
-{
-    public static readonly IType Any           = new External("google.protobuf.Any");
-    public static readonly IType Api           = new External("google.protobuf.Api");
-    public static readonly IType BoolValue     = new External("google.protobuf.BoolValue");
-    public static readonly IType BytesValue    = new External("google.protobuf.BytesValue");
-    public static readonly IType DoubleValue   = new External("google.protobuf.DoubleValue");
-    public static readonly IType Duration      = new External("google.protobuf.Duration");
-    public static readonly IType Empty         = new External("google.protobuf.Empty");
-    public static readonly IType Enum          = new External("google.protobuf.Enum");
-    public static readonly IType EnumValue     = new External("google.protobuf.EnumValue");
-    public static readonly IType Field         = new External("google.protobuf.Field");
-    public static readonly IType FieldMask     = new External("google.protobuf.FieldMask");
-    public static readonly IType FloatValue    = new External("google.protobuf.FloatValue");
-    public static readonly IType Int32Value    = new External("google.protobuf.Int32Value");
-    public static readonly IType Int64Value    = new External("google.protobuf.Int64Value");
-    public static readonly IType ListValue     = new External("google.protobuf.ListValue");
-    public static readonly IType Method        = new External("google.protobuf.Method");
-    public static readonly IType Mixin         = new External("google.protobuf.Mixin");
-    public static readonly IType NullValue     = new External("google.protobuf.NullValue");
-    public static readonly IType Option        = new External("google.protobuf.Option");
-    public static readonly IType SourceContext = new External("google.protobuf.SourceContext");
-    public static readonly IType StringValue   = new External("google.protobuf.StringValue");
-    public static readonly IType Struct        = new External("google.protobuf.Struct");
-    public static readonly IType Syntax        = new External("google.protobuf.Syntax");
-    public static readonly IType Timestamp     = new External("google.protobuf.Timestamp");
-    public static readonly IType Type          = new External("google.protobuf.Type");
-    public static readonly IType UInt32Value   = new External("google.protobuf.UInt32Value");
-    public static readonly IType UInt64Value   = new External("google.protobuf.UInt64Value");
-    public static readonly IType Value         = new External("google.protobuf.Value");
-}

src/LibProtodec/ProtodecContext.cs

@@ -10,32 +10,31 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Reflection;
+using System.Reflection.Emit;
 using SystemEx;
+using SystemEx.Memory;
 using CommunityToolkit.Diagnostics;
-using LibProtodec.Models;
+using LibProtodec.Models.Cil;
-using LibProtodec.Models.Fields;
+using LibProtodec.Models.Protobuf;
-using LibProtodec.Models.TopLevels;
+using LibProtodec.Models.Protobuf.Fields;
-using LibProtodec.Models.Types;
+using LibProtodec.Models.Protobuf.TopLevels;
+using LibProtodec.Models.Protobuf.Types;
+using Microsoft.Extensions.Logging;
 
 namespace LibProtodec;
 
-public delegate bool TypeLookupFunc(Type type, [NotNullWhen(true)] out IType? fieldType, out string? import);
 public delegate bool NameLookupFunc(string name, [MaybeNullWhen(false)] out string translatedName);
 
-public sealed class ProtodecContext
+// ReSharper disable ClassWithVirtualMembersNeverInherited.Global, MemberCanBePrivate.Global, MemberCanBeProtected.Global
+public class ProtodecContext
 {
-    private const BindingFlags PublicStatic           = BindingFlags.Public | BindingFlags.Static;
-    private const BindingFlags PublicInstanceDeclared = BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly;
-
     private readonly Dictionary<string, TopLevel> _parsed = [];
 
     public readonly List<Protobuf> Protobufs = [];
 
-    public NameLookupFunc? NameLookup { get; set; }
+    public ILogger? Logger { get; set; }
 
-    public TypeLookupFunc TypeLookup { get; set; } =
+    public NameLookupFunc? NameLookup { get; set; }
-        LookupScalarAndWellKnownTypes;
 
     public void WriteAllTo(IndentedTextWriter writer)
     {
@@ -52,109 +51,162 @@ public sealed class ProtodecContext
         }
     }
 
-    public Message ParseMessage(Type messageClass, ParserOptions options = ParserOptions.None)
+    public virtual Message ParseMessage(ICilType messageClass, ParserOptions options = ParserOptions.None)
     {
         Guard.IsTrue(messageClass is { IsClass: true, IsSealed: true });
+        using IDisposable? _ = Logger?.BeginScopeParsingMessage(messageClass.FullName);
 
-        if (_parsed.TryGetValue(messageClass.FullName ?? messageClass.Name, out TopLevel? parsedMessage))
+        if (_parsed.TryGetValue(messageClass.FullName, out TopLevel? parsedMessage))
         {
+            Logger?.LogParsedMessage(parsedMessage.Name);
             return (Message)parsedMessage;
         }
 
         Message message = new()
         {
             Name       = TranslateTypeName(messageClass),
-            IsObsolete = HasObsoleteAttribute(messageClass.GetCustomAttributesData())
+            IsObsolete = HasObsoleteAttribute(messageClass.CustomAttributes)
         };
-        _parsed.Add(messageClass.FullName ?? messageClass.Name, message);
+        _parsed.Add(messageClass.FullName, message);
 
         Protobuf protobuf = GetProtobuf(messageClass, message, options);
 
-        FieldInfo[]    idFields   = messageClass.GetFields(PublicStatic);
+        ParseWriteToMethodTesting(messageClass);
-        PropertyInfo[] properties = messageClass.GetProperties(PublicInstanceDeclared);
 
-        for (int pi = 0, fi = 0; pi < properties.Length; pi++, fi++)
+        List<ICilField> idFields = messageClass.GetFields()
-        {
+                                               .Where(static field => field is { IsPublic: true, IsStatic: true, IsLiteral: true })
-            PropertyInfo               property   = properties[pi];
+                                               .ToList();
-            IList<CustomAttributeData> attributes = property.GetCustomAttributesData();
 
-            if (((options & ParserOptions.IncludePropertiesWithoutNonUserCodeAttribute) == 0 && !HasNonUserCodeAttribute(attributes))
+        List<ICilProperty> properties = messageClass.GetProperties()
-             || property.GetMethod?.IsVirtual != false)
+                                                    .Where(static property => property is { IsInherited: false, CanRead: true, Getter: { IsPublic: true, IsStatic: false, IsVirtual: false } })
+                                                    .ToList();
+
+        for (int pi = 0, fi = 0; pi < properties.Count; pi++)
         {
-                fi--;
+            ICilProperty property     = properties[pi];
+            ICilType     propertyType = property.Type;
+
+            using IDisposable? __ = Logger?.BeginScopeParsingProperty(property.Name, propertyType.FullName);
+
+            if (((options & ParserOptions.IncludePropertiesWithoutNonUserCodeAttribute) == 0 && !HasNonUserCodeAttribute(property.CustomAttributes)))
+            {
+                Logger?.LogSkippingPropertyWithoutNonUserCodeAttribute();
                 continue;
             }
 
-            Type propertyType = property.PropertyType;
-
             // only OneOf enums are defined nested directly in the message class
             if (propertyType.IsEnum && propertyType.DeclaringType?.Name == messageClass.Name)
             {
                 string oneOfName = TranslateOneOfPropName(property.Name);
-                int[] oneOfProtoFieldIds = propertyType.GetFields(PublicStatic)
+                Logger?.LogParsedOneOfField(oneOfName);
-                                                       .Select(static field => (int)field.GetRawConstantValue()!)
+
+                List<int> oneOfProtoFieldIds = propertyType.GetFields()
+                                                           .Where(static field => field.IsLiteral)
+                                                           .Select(static field => (int)field.ConstantValue!)
                                                            .Where(static id => id > 0)
-                                                       .ToArray();
+                                                           .ToList();
 
                 message.OneOfs.Add(oneOfName, oneOfProtoFieldIds);
-                
-                fi--;
                 continue;
             }
 
-            FieldInfo idField = idFields[fi];
-            Guard.IsTrue(idField.IsLiteral);
-            Guard.IsEqualTo(idField.FieldType.Name, nameof(Int32));
-
             bool msgFieldHasHasProp = false; // some field properties are immediately followed by an additional "Has" get-only boolean property
-            if (properties.Length > pi + 1 && properties[pi + 1].PropertyType.Name == nameof(Boolean) && !properties[pi + 1].CanWrite)
+            if (properties.Count > pi + 1 && properties[pi + 1].Type.Name == nameof(Boolean) && !properties[pi + 1].CanWrite)
             {
                 msgFieldHasHasProp = true;
                 pi++;
             }
 
-            MessageField field = new()
+            if (idFields.Count <= fi)
+            {
+                Logger?.LogFailedToLocateIdField();
+                continue;
+            }
+
+            MessageField field = new(message)
             {
                 Type       = ParseFieldType(propertyType, options, protobuf),
                 Name       = TranslateMessageFieldName(property.Name),
-                Id         = (int)idField.GetRawConstantValue()!,
+                Id         = (int)idFields[fi].ConstantValue!,
-                IsObsolete = HasObsoleteAttribute(attributes),
+                IsObsolete = HasObsoleteAttribute(property.CustomAttributes),
                 HasHasProp = msgFieldHasHasProp
             };
 
+            Logger?.LogParsedField(field.Name, field.Id, field.Type.Name);
             message.Fields.Add(field.Id, field);
+            fi++;
         }
 
+        Logger?.LogParsedMessage(message.Name);
         return message;
     }
 
-    public Enum ParseEnum(Type enumEnum, ParserOptions options = ParserOptions.None)
+    private static void ParseWriteToMethodTesting(ICilType messageClass)
+    {
+        ICilMethod   writeTo = messageClass.GetMethods().Single(static method => method.Name == "WriteTo");
+        MemoryReader reader  = new(writeTo.GetMethodBodyILAsByteArray());
+
+        int fieldToken = 0;
+        while (reader.Remaining > 0)
+        {
+            OpCode opCode = reader.ReadCilOpCode(out int operandLength);
+            if (opCode == OpCodes.Ret) // DummyDLL from il2cppdumper will only have ret in method body
+                return;
+
+            if (opCode == OpCodes.Ldfld)
+            {
+                fieldToken = reader.ReadInt32LittleEndian();
+            }
+            else if (opCode == OpCodes.Call)
+            {
+                Guard.IsNotEqualTo(fieldToken, 0);
+                int methodToken = reader.ReadInt32LittleEndian();
+
+                string methodName = messageClass.DeclaringModule.ResolveMethodName(methodToken); // System.NotSupportedException: 'Resolving tokens is not supported on assemblies loaded by a MetadataLoadContext.'
+                string fieldName  = messageClass.DeclaringModule.ResolveFieldName(fieldToken);
+
+                //TODO
+            }
+            else
+            {
+                reader.Position += operandLength;
+            }
+        }
+    }
+
+    public virtual Enum ParseEnum(ICilType enumEnum, ParserOptions options = ParserOptions.None)
     {
         Guard.IsTrue(enumEnum.IsEnum);
+        using IDisposable? _ = Logger?.BeginScopeParsingEnum(enumEnum.FullName);
 
-        if (_parsed.TryGetValue(enumEnum.FullName ?? enumEnum.Name, out TopLevel? parsedEnum))
+        if (_parsed.TryGetValue(enumEnum.FullName, out TopLevel? parsedEnum))
         {
+            Logger?.LogParsedEnum(parsedEnum.Name);
             return (Enum)parsedEnum;
         }
 
         Enum @enum = new()
         {
             Name         = TranslateTypeName(enumEnum),
-            IsObsolete   = HasObsoleteAttribute(enumEnum.GetCustomAttributesData())
+            IsObsolete   = HasObsoleteAttribute(enumEnum.CustomAttributes)
         };
-        _parsed.Add(enumEnum.FullName ?? enumEnum.Name, @enum);
+        _parsed.Add(enumEnum.FullName, @enum);
 
         Protobuf protobuf = GetProtobuf(enumEnum, @enum, options);
 
-        foreach (FieldInfo field in enumEnum.GetFields(PublicStatic))
+        foreach (ICilField enumField in enumEnum.GetFields().Where(static field => field.IsLiteral))
         {
-            @enum.Fields.Add(
+            using IDisposable? __ = Logger?.BeginScopeParsingField(enumField.Name);
-                new EnumField
+
+            EnumField field = new()
             {
-                    Id         = (int)field.GetRawConstantValue()!,
+                Id         = (int)enumField.ConstantValue!,
-                    Name       = TranslateEnumFieldName(field, @enum.Name),
+                Name       = TranslateEnumFieldName(enumField.CustomAttributes, enumField.Name, @enum.Name),
-                    IsObsolete = HasObsoleteAttribute(field.GetCustomAttributesData())
+                IsObsolete = HasObsoleteAttribute(enumField.CustomAttributes)
-                });
+            };
+
+            Logger?.LogParsedField(field.Name, field.Id);
+            @enum.Fields.Add(field);
         }
 
         if (@enum.Fields.All(static field => field.Id != 0))
@@ -163,10 +215,11 @@ public sealed class ProtodecContext
             @enum.IsClosed   = true;
         }
 
+        Logger?.LogParsedEnum(@enum.Name);
         return @enum;
     }
 
-    public Service ParseService(Type serviceClass, ParserOptions options = ParserOptions.None)
+    public virtual Service ParseService(ICilType serviceClass, ParserOptions options = ParserOptions.None)
     {
         Guard.IsTrue(serviceClass.IsClass);
 
@@ -175,7 +228,7 @@ public sealed class ProtodecContext
         {
             if (serviceClass is { IsSealed: true, IsNested: false })
             {
-                Type[] nested = serviceClass.GetNestedTypes();
+                List<ICilType> nested = serviceClass.GetNestedTypes().ToList();
                 serviceClass = nested.SingleOrDefault(static nested => nested is { IsAbstract: true, IsSealed: false }) 
                             ?? nested.Single(static nested => nested is { IsClass: true, IsAbstract: false });
             }
@@ -192,31 +245,35 @@ public sealed class ProtodecContext
         }
 
         Guard.IsNotNull(isClientClass);
+        using IDisposable? _ = Logger?.BeginScopeParsingService(serviceClass.DeclaringType!.FullName);
 
-        if (_parsed.TryGetValue(serviceClass.DeclaringType!.FullName ?? serviceClass.DeclaringType!.Name, out TopLevel? parsedService))
+        if (_parsed.TryGetValue(serviceClass.DeclaringType!.FullName, out TopLevel? parsedService))
         {
+            Logger?.LogParsedService(parsedService.Name);
             return (Service)parsedService;
         }
 
         Service service = new()
         {
             Name         = TranslateTypeName(serviceClass.DeclaringType),
-            IsObsolete   = HasObsoleteAttribute(serviceClass.GetCustomAttributesData())
+            IsObsolete   = HasObsoleteAttribute(serviceClass.CustomAttributes)
         };
-        _parsed.Add(serviceClass.DeclaringType!.FullName ?? serviceClass.DeclaringType.Name, service);
+        _parsed.Add(serviceClass.DeclaringType!.FullName, service);
 
         Protobuf protobuf = NewProtobuf(serviceClass, service);
 
-        foreach (MethodInfo method in serviceClass.GetMethods(PublicInstanceDeclared))
+        foreach (ICilMethod cilMethod in serviceClass.GetMethods().Where(static method => method is { IsInherited: false, IsPublic: true, IsStatic: false, IsConstructor: false }))
         {
-            IList<CustomAttributeData> attributes = method.GetCustomAttributesData();
+            using IDisposable? __ = Logger?.BeginScopeParsingMethod(cilMethod.Name);
+
             if ((options & ParserOptions.IncludeServiceMethodsWithoutGeneratedCodeAttribute) == 0
-             && !HasGeneratedCodeAttribute(attributes, "grpc_csharp_plugin"))
+             && !HasGeneratedCodeAttribute(cilMethod.CustomAttributes, "grpc_csharp_plugin"))
             {
+                Logger?.LogSkippingMethodWithoutGeneratedCodeAttribute();
                 continue;
             }
 
-            Type requestType, responseType, returnType = method.ReturnType;
+            ICilType requestType, responseType, returnType = cilMethod.ReturnType;
             bool streamReq, streamRes;
 
             if (isClientClass.Value)
@@ -224,17 +281,18 @@ public sealed class ProtodecContext
                 string returnTypeName = TranslateTypeName(returnType);
                 if (returnTypeName == "AsyncUnaryCall`1")
                 {
+                    Logger?.LogSkippingDuplicateMethod();
                     continue;
                 }
 
-                ParameterInfo[] parameters = method.GetParameters();
+                List<ICilType> parameters = cilMethod.GetParameterTypes().ToList();
-                if (parameters.Length > 2)
+                if (parameters.Count > 2)
                 {
+                    Logger?.LogSkippingDuplicateMethod();
                     continue;
                 }
 
-                Type firstParamType = parameters[0].ParameterType;
+                switch (returnType.GenericTypeArguments.Count)
-                switch (returnType.GenericTypeArguments.Length)
                 {
                     case 2:
                         requestType  = returnType.GenericTypeArguments[0];
@@ -243,13 +301,13 @@ public sealed class ProtodecContext
                         streamRes    = returnTypeName == "AsyncDuplexStreamingCall`2";
                         break;
                     case 1:
-                        requestType  = firstParamType;
+                        requestType  = parameters[0];
                         responseType = returnType.GenericTypeArguments[0];
                         streamReq    = false;
                         streamRes    = true;
                         break;
                     default:
-                        requestType  = firstParamType;
+                        requestType  = parameters[0];
                         responseType = returnType;
                         streamReq    = false;
                         streamRes    = false;
@@ -258,21 +316,20 @@ public sealed class ProtodecContext
             }
             else
             {
-                ParameterInfo[] parameters     = method.GetParameters();
+                List<ICilType> parameters = cilMethod.GetParameterTypes().ToList();
-                Type            firstParamType = parameters[0].ParameterType;
 
-                if (firstParamType.GenericTypeArguments.Length == 1)
+                if (parameters[0].GenericTypeArguments.Count == 1)
                 {
                     streamReq   = true;
-                    requestType = firstParamType.GenericTypeArguments[0];
+                    requestType = parameters[0].GenericTypeArguments[0];
                 }
                 else
                 {
                     streamReq   = false;
-                    requestType = firstParamType;
+                    requestType = parameters[0];
                 }
 
-                if (returnType.GenericTypeArguments.Length == 1)
+                if (returnType.GenericTypeArguments.Count == 1)
                 {
                     streamRes    = false;
                     responseType = returnType.GenericTypeArguments[0];
@@ -280,28 +337,31 @@ public sealed class ProtodecContext
                 else
                 {
                     streamRes    = true;
-                    responseType = parameters[1].ParameterType.GenericTypeArguments[0];
+                    responseType = parameters[1].GenericTypeArguments[0];
                 }
             }
 
-            service.Methods.Add(
+            ServiceMethod method = new(service)
-                new ServiceMethod
             {
-                    Name               = TranslateMethodName(method.Name),
+                Name               = TranslateMethodName(cilMethod.Name),
-                    IsObsolete         = HasObsoleteAttribute(attributes),
+                IsObsolete         = HasObsoleteAttribute(cilMethod.CustomAttributes),
                 RequestType        = ParseFieldType(requestType,  options, protobuf),
                 ResponseType       = ParseFieldType(responseType, options, protobuf),
                 IsRequestStreamed  = streamReq,
                 IsResponseStreamed = streamRes
-                });
+            };
+
+            Logger?.LogParsedMethod(method.Name, method.RequestType.Name, method.ResponseType.Name);
+            service.Methods.Add(method);
         }
 
+        Logger?.LogParsedService(service.Name);
         return service;
     }
 
-    private IType ParseFieldType(Type type, ParserOptions options, Protobuf referencingProtobuf)
+    protected IProtobufType ParseFieldType(ICilType type, ParserOptions options, Protobuf referencingProtobuf)
     {
-        switch (type.GenericTypeArguments.Length)
+        switch (type.GenericTypeArguments.Count)
         {
             case 1:
                 return new Repeated(
@@ -312,16 +372,8 @@ public sealed class ProtodecContext
                     ParseFieldType(type.GenericTypeArguments[1], options, referencingProtobuf));
         }
 
-        if (TypeLookup(type, out IType? fieldType, out string? import))
+        if (!LookupType(type, out IProtobufType? fieldType))
         {
-            if (import is not null)
-            {
-                referencingProtobuf.Imports.Add(import);
-            }
-
-            return fieldType;
-        }
-
             if (type.IsEnum)
             {
                 if ((options & ParserOptions.SkipEnums) > 0)
@@ -335,21 +387,155 @@ public sealed class ProtodecContext
             {
                 fieldType = ParseMessage(type, options);
             }
+        }
 
-        Protobuf protobuf = ((INestableType)fieldType).Protobuf!;
+        switch (fieldType)
-        if (referencingProtobuf != protobuf)
         {
-            referencingProtobuf.Imports.Add(protobuf.FileName);
+            case WellKnown wellKnown:
+                referencingProtobuf.Imports.Add(
+                    wellKnown.FileName);
+                break;
+            case INestableType nestableType:
+                Protobuf protobuf = nestableType.Protobuf!;
+                if (referencingProtobuf != protobuf)
+                    referencingProtobuf.Imports.Add(
+                        protobuf.FileName);
+                break;
         }
 
         return fieldType;
     }
 
-    private Protobuf NewProtobuf(Type topLevelType, TopLevel topLevel)
+    protected virtual bool LookupType(ICilType cilType, [NotNullWhen(true)] out IProtobufType? protobufType)
+    {
+        switch (cilType.FullName)
+        {
+            case "System.String":
+                protobufType = Scalar.String;
+                break;
+            case "System.Boolean":
+                protobufType = Scalar.Bool;
+                break;
+            case "System.Double":
+                protobufType = Scalar.Double;
+                break;
+            case "System.UInt32":
+                protobufType = Scalar.UInt32;
+                break;
+            case "System.UInt64":
+                protobufType = Scalar.UInt64;
+                break;
+            case "System.Int32":
+                protobufType = Scalar.Int32;
+                break;
+            case "System.Int64":
+                protobufType = Scalar.Int64;
+                break;
+            case "System.Single":
+                protobufType = Scalar.Float;
+                break;
+            case "Google.Protobuf.ByteString":
+                protobufType = Scalar.Bytes;
+                break;
+
+            case "Google.Protobuf.WellKnownTypes.Any":
+                protobufType = WellKnown.Any;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Api":
+                protobufType = WellKnown.Api;
+                break;
+            case "Google.Protobuf.WellKnownTypes.BoolValue":
+                protobufType = WellKnown.BoolValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.BytesValue":
+                protobufType = WellKnown.BytesValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.DoubleValue":
+                protobufType = WellKnown.DoubleValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Duration":
+                protobufType = WellKnown.Duration;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Empty":
+                protobufType = WellKnown.Empty;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Enum":
+                protobufType = WellKnown.Enum;
+                break;
+            case "Google.Protobuf.WellKnownTypes.EnumValue":
+                protobufType = WellKnown.EnumValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Field":
+                protobufType = WellKnown.Field;
+                break;
+            case "Google.Protobuf.WellKnownTypes.FieldMask":
+                protobufType = WellKnown.FieldMask;
+                break;
+            case "Google.Protobuf.WellKnownTypes.FloatValue":
+                protobufType = WellKnown.FloatValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Int32Value":
+                protobufType = WellKnown.Int32Value;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Int64Value":
+                protobufType = WellKnown.Int64Value;
+                break;
+            case "Google.Protobuf.WellKnownTypes.ListValue":
+                protobufType = WellKnown.ListValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Method":
+                protobufType = WellKnown.Method;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Mixin":
+                protobufType = WellKnown.Mixin;
+                break;
+            case "Google.Protobuf.WellKnownTypes.NullValue":
+                protobufType = WellKnown.NullValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Option":
+                protobufType = WellKnown.Option;
+                break;
+            case "Google.Protobuf.WellKnownTypes.SourceContext":
+                protobufType = WellKnown.SourceContext;
+                break;
+            case "Google.Protobuf.WellKnownTypes.StringValue":
+                protobufType = WellKnown.StringValue;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Struct":
+                protobufType = WellKnown.Struct;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Syntax":
+                protobufType = WellKnown.Syntax;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Timestamp":
+                protobufType = WellKnown.Timestamp;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Type":
+                protobufType = WellKnown.Type;
+                break;
+            case "Google.Protobuf.WellKnownTypes.UInt32Value":
+                protobufType = WellKnown.UInt32Value;
+                break;
+            case "Google.Protobuf.WellKnownTypes.UInt64Value":
+                protobufType = WellKnown.UInt64Value;
+                break;
+            case "Google.Protobuf.WellKnownTypes.Value":
+                protobufType = WellKnown.Value;
+                break;
+
+            default:
+                protobufType = null;
+                return false;
+        }
+
+        return true;
+    }
+
+    protected Protobuf NewProtobuf(ICilType topLevelType, TopLevel topLevel)
     {
         Protobuf protobuf = new()
         {
-            AssemblyName = topLevelType.Assembly.FullName,
+            AssemblyName = topLevelType.DeclaringAssemblyName,
             Namespace    = topLevelType.Namespace
         };
 
@@ -360,14 +546,14 @@ public sealed class ProtodecContext
         return protobuf;
     }
 
-    private Protobuf GetProtobuf<T>(Type topLevelType, T topLevel, ParserOptions options)
+    protected Protobuf GetProtobuf<T>(ICilType topLevelType, T topLevel, ParserOptions options)
         where T : TopLevel, INestableType
     {
         Protobuf protobuf;
         if (topLevelType.IsNested)
         {
-            Type parent = topLevelType.DeclaringType!.DeclaringType!;
+            ICilType parent = topLevelType.DeclaringType!.DeclaringType!;
-            if (!_parsed.TryGetValue(parent.FullName ?? parent.Name, out TopLevel? parentTopLevel))
+            if (!_parsed.TryGetValue(parent.FullName, out TopLevel? parentTopLevel))
             {
                 parentTopLevel = ParseMessage(parent, options);
             }
@@ -386,12 +572,12 @@ public sealed class ProtodecContext
         return protobuf;
     }
 
-    private string TranslateMethodName(string methodName) =>
+    protected string TranslateMethodName(string methodName) =>
         NameLookup?.Invoke(methodName, out string? translatedName) == true
             ? translatedName
             : methodName;
 
-    private string TranslateOneOfPropName(string oneOfPropName)
+    protected string TranslateOneOfPropName(string oneOfPropName)
     {
         if (NameLookup?.Invoke(oneOfPropName, out string? translatedName) != true)
         {
@@ -406,7 +592,7 @@ public sealed class ProtodecContext
         return translatedName!.TrimEnd("Case").ToSnakeCaseLower();
     }
 
-    private string TranslateMessageFieldName(string fieldName)
+    protected string TranslateMessageFieldName(string fieldName)
     {
         if (NameLookup?.Invoke(fieldName, out string? translatedName) != true)
         {
@@ -421,25 +607,22 @@ public sealed class ProtodecContext
         return translatedName!.ToSnakeCaseLower();
     }
 
-    private string TranslateEnumFieldName(FieldInfo field, string enumName)
+    protected string TranslateEnumFieldName(IEnumerable<ICilAttribute> attributes, string fieldName, string enumName)
     {
-        if (field.GetCustomAttributesData()
+        if (attributes.SingleOrDefault(static attr => attr.Type.Name == "OriginalNameAttribute")
-                 .SingleOrDefault(static attr => attr.AttributeType.Name == "OriginalNameAttribute")
+                     ?.ConstructorArgumentValues[0] is string originalName)
-                ?.ConstructorArguments[0]
-                 .Value
-            is string originalName)
         {
             return originalName;
         }
 
-        if (NameLookup?.Invoke(field.Name, out string? fieldName) != true)
+        if (NameLookup?.Invoke(fieldName, out string? translatedName) == true)
         {
-            fieldName = field.Name;
+            fieldName = translatedName;
         }
 
-        if (!IsBeebyted(fieldName!))
+        if (!IsBeebyted(fieldName))
         {
-            fieldName = fieldName!.ToSnakeCaseUpper();
+            fieldName = fieldName.ToSnakeCaseUpper();
         }
 
         if (!IsBeebyted(enumName))
@@ -450,14 +633,12 @@ public sealed class ProtodecContext
         return enumName + '_' + fieldName;
     }
 
-    private string TranslateTypeName(Type type)
+    protected string TranslateTypeName(ICilType type)
     {
         if (NameLookup is null)
             return type.Name;
 
-        string? fullName = type.FullName;
+        string fullName = type.FullName;
-        Guard.IsNotNull(fullName);
-
         int genericArgs = fullName.IndexOf('[');
         if (genericArgs != -1)
             fullName = fullName[..genericArgs];
@@ -478,177 +659,17 @@ public sealed class ProtodecContext
         return translatedName;
     }
 
-    public static bool LookupScalarAndWellKnownTypes(Type type, [NotNullWhen(true)] out IType? fieldType, out string? import)
-    {
-        switch (type.FullName)
-        {
-            case "System.String":
-                import    = null;
-                fieldType = Scalar.String;
-                return true;
-            case "System.Boolean":
-                import    = null;
-                fieldType = Scalar.Bool;
-                return true;
-            case "System.Double":
-                import    = null;
-                fieldType = Scalar.Double;
-                return true;
-            case "System.UInt32":
-                import    = null;
-                fieldType = Scalar.UInt32;
-                return true;
-            case "System.UInt64":
-                import    = null;
-                fieldType = Scalar.UInt64;
-                return true;
-            case "System.Int32":
-                import    = null;
-                fieldType = Scalar.Int32;
-                return true;
-            case "System.Int64":
-                import    = null;
-                fieldType = Scalar.Int64;
-                return true;
-            case "System.Single":
-                import    = null;
-                fieldType = Scalar.Float;
-                return true;
-            case "Google.Protobuf.ByteString":
-                import    = null;
-                fieldType = Scalar.Bytes;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Any":
-                import    = "google/protobuf/any.proto";
-                fieldType = WellKnown.Any;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Api":
-                import    = "google/protobuf/api.proto";
-                fieldType = WellKnown.Api;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.BoolValue":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.BoolValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.BytesValue":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.BytesValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.DoubleValue":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.DoubleValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Duration":
-                import    = "google/protobuf/duration.proto";
-                fieldType = WellKnown.Duration;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Empty":
-                import    = "google/protobuf/empty.proto";
-                fieldType = WellKnown.Empty;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Enum":
-                import    = "google/protobuf/type.proto";
-                fieldType = WellKnown.Enum;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.EnumValue":
-                import    = "google/protobuf/type.proto";
-                fieldType = WellKnown.EnumValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Field":
-                import    = "google/protobuf/type.proto";
-                fieldType = WellKnown.Field;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.FieldMask":
-                import    = "google/protobuf/field_mask.proto";
-                fieldType = WellKnown.FieldMask;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.FloatValue":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.FloatValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Int32Value":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.Int32Value;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Int64Value":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.Int64Value;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.ListValue":
-                import    = "google/protobuf/struct.proto";
-                fieldType = WellKnown.ListValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Method":
-                import    = "google/protobuf/api.proto";
-                fieldType = WellKnown.Method;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Mixin":
-                import    = "google/protobuf/api.proto";
-                fieldType = WellKnown.Mixin;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.NullValue":
-                import    = "google/protobuf/struct.proto";
-                fieldType = WellKnown.NullValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Option":
-                import    = "google/protobuf/type.proto";
-                fieldType = WellKnown.Option;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.SourceContext":
-                import    = "google/protobuf/source_context.proto";
-                fieldType = WellKnown.SourceContext;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.StringValue":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.StringValue;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Struct":
-                import    = "google/protobuf/struct.proto";
-                fieldType = WellKnown.Struct;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Syntax":
-                import    = "google/protobuf/type.proto";
-                fieldType = WellKnown.Syntax;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Timestamp":
-                import    = "google/protobuf/timestamp.proto";
-                fieldType = WellKnown.Timestamp;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Type":
-                import    = "google/protobuf/type.proto";
-                fieldType = WellKnown.Type;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.UInt32Value":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.UInt32Value;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.UInt64Value":
-                import    = "google/protobuf/wrappers.proto";
-                fieldType = WellKnown.UInt64Value;
-                return true;
-            case "Google.Protobuf.WellKnownTypes.Value":
-                import    = "google/protobuf/struct.proto";
-                fieldType = WellKnown.Value;
-                return true;
-
-            default:
-                import    = null;
-                fieldType = null;
-                return false;
-        }
-    }
-
     // ReSharper disable once IdentifierTypo
-    private static bool IsBeebyted(string name) =>
+    protected static bool IsBeebyted(string name) =>
         name.Length == 11 && name.CountUpper() == 11;
 
-    private static bool HasGeneratedCodeAttribute(IEnumerable<CustomAttributeData> attributes, string tool) =>
+    protected static bool HasGeneratedCodeAttribute(IEnumerable<ICilAttribute> attributes, string tool) =>
-        attributes.Any(attr => attr.AttributeType.Name                      == nameof(GeneratedCodeAttribute)
+        attributes.Any(attr => attr.Type.Name                              == nameof(GeneratedCodeAttribute)
-                            && attr.ConstructorArguments[0].Value as string == tool);
+                            && attr.ConstructorArgumentValues[0] as string == tool);
 
-    private static bool HasNonUserCodeAttribute(IEnumerable<CustomAttributeData> attributes) =>
+    protected static bool HasNonUserCodeAttribute(IEnumerable<ICilAttribute> attributes) =>
-        attributes.Any(static attr => attr.AttributeType.Name == nameof(DebuggerNonUserCodeAttribute));
+        attributes.Any(static attr => attr.Type.Name == nameof(DebuggerNonUserCodeAttribute));
 
-    private static bool HasObsoleteAttribute(IEnumerable<CustomAttributeData> attributes) =>
+    protected static bool HasObsoleteAttribute(IEnumerable<ICilAttribute> attributes) =>
-        attributes.Any(static attr => attr.AttributeType.Name == nameof(ObsoleteAttribute));
+        attributes.Any(static attr => attr.Type.Name == nameof(ObsoleteAttribute));
 }

src/protodec/Program.cs

@@ -1,10 +1,19 @@
-using System;
+// Copyright © 2024 Xpl0itR
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using LibProtodec;
-using LibProtodec.Models;
+using LibProtodec.Loaders;
+using LibProtodec.Models.Cil;
+using LibProtodec.Models.Protobuf;
+using Microsoft.Extensions.Logging;
 
 const string indent = "  ";
 const string help   = """
@@ -13,6 +22,7 @@ const string help   = """
       target_assembly_path  Either the path to the target assembly or a directory of assemblies, all of which be parsed.
       out_path              An existing directory to output into individual files, otherwise output to a single file.
     Options:
+      --debug                                                     Drops the minimum log level to Debug.
       --parse_service_servers                                     Parses gRPC service definitions from server classes.
       --parse_service_clients                                     Parses gRPC service definitions from client classes.
       --skip_enums                                                Skip parsing enums and replace references to them with int32.
@@ -29,6 +39,9 @@ if (args.Length < 2)
 string        assembly = args[0];
 string        outPath  = Path.GetFullPath(args[1]);
 ParserOptions options  = ParserOptions.None;
+LogLevel      logLevel = args.Contains("--debug")
+    ? LogLevel.Debug
+    : LogLevel.Information;
 
 if (args.Contains("--skip_enums"))
     options |= ParserOptions.SkipEnums;
@@ -39,17 +52,30 @@ if (args.Contains("--include_properties_without_non_user_code_attribute"))
 if (args.Contains("--include_service_methods_without_generated_code_attribute"))
     options |= ParserOptions.IncludeServiceMethodsWithoutGeneratedCodeAttribute;
 
-using AssemblyInspector inspector = new(assembly);
+using ILoggerFactory loggerFactory = LoggerFactory.Create(
-ProtodecContext ctx = new();
+    builder => builder.AddSimpleConsole(static console => console.IncludeScopes = true)
+                      .SetMinimumLevel(logLevel));
+ILogger logger = loggerFactory.CreateLogger("protodec");
 
-foreach (Type message in inspector.GetProtobufMessageTypes())
+logger.LogInformation("Loading target assemblies...");
+using CilAssemblyLoader loader = new ClrAssemblyLoader(
+    assembly, loggerFactory.CreateLogger<ClrAssemblyLoader>());
+
+ProtodecContext ctx = new()
+{
+    Logger = loggerFactory.CreateLogger<ProtodecContext>()
+};
+
+logger.LogInformation("Parsing Protobuf message types...");
+foreach (ICilType message in GetProtobufMessageTypes())
 {
     ctx.ParseMessage(message, options);
 }
 
 if (args.Contains("--parse_service_servers"))
 {
-    foreach (Type service in inspector.GetProtobufServiceServerTypes())
+    logger.LogInformation("Parsing Protobuf service server types...");
+    foreach (ICilType service in GetProtobufServiceServerTypes())
     {
         ctx.ParseService(service, options);
     }
@@ -57,7 +83,8 @@ if (args.Contains("--parse_service_servers"))
 
 if (args.Contains("--parse_service_clients"))
 {
-    foreach (Type service in inspector.GetProtobufServiceClientTypes())
+    logger.LogInformation("Parsing Protobuf service client types...");
+    foreach (ICilType service in GetProtobufServiceClientTypes())
     {
         ctx.ParseService(service, options);
     }
@@ -65,8 +92,9 @@ if (args.Contains("--parse_service_clients"))
 
 if (Directory.Exists(outPath))
 {
-    HashSet<string> writtenFiles = [];
+    logger.LogInformation("Writing {count} Protobuf files to \"{path}\"...", ctx.Protobufs.Count, outPath);
 
+    HashSet<string> writtenFiles = [];
     foreach (Protobuf protobuf in ctx.Protobufs)
     {
         // This workaround stops files from being overwritten in the case of a naming conflict,
@@ -87,8 +115,26 @@ if (Directory.Exists(outPath))
 }
 else
 {
+    logger.LogInformation("Writing Protobufs as a single file to \"{path}\"...", outPath);
+
     using StreamWriter       streamWriter = new(outPath);
     using IndentedTextWriter indentWriter = new(streamWriter, indent);
 
     ctx.WriteAllTo(indentWriter);
 }
+
+IEnumerable<ICilType> GetProtobufMessageTypes() =>
+    loader.LoadedTypes.Where(
+        type => type is { IsNested: false, IsSealed: true }
+             && type.Namespace?.StartsWith("Google.Protobuf", StringComparison.Ordinal) != true
+             && type.IsAssignableTo(loader.IMessage));
+
+IEnumerable<ICilType> GetProtobufServiceClientTypes() =>
+    loader.LoadedTypes.Where(
+        type => type is { IsNested: true, IsAbstract: false }
+             && type.IsAssignableTo(loader.ClientBase));
+
+IEnumerable<ICilType> GetProtobufServiceServerTypes() =>
+    loader.LoadedTypes.Where(
+        type => type is { IsNested: true, IsAbstract: true, DeclaringType: { IsNested: false, IsSealed: true, IsAbstract: true } }
+             && type.CustomAttributes.Any(attribute => attribute.Type == loader.BindServiceMethodAttribute));

src/protodec/protodec.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)src\LibProtodec\LibProtodec.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.5.24306.7" />
   </ItemGroup>
 
 </Project>