From 8e91ca32a184a19bf2c09d82e676cce3f4f223eb Mon Sep 17 00:00:00 2001
From: Holger Schmidt <leroyz.mailaccount@gmx.net>
Date: Wed, 6 Nov 2024 21:06:42 +0100
Subject: [PATCH] added required ilspycmd options and routed call

---
 ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs | 68 +++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs b/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs
index 57e08d5e3..2879b2d89 100644
--- a/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs
+++ b/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs
@@ -18,6 +18,7 @@ using ICSharpCode.Decompiler.Disassembler;
 using ICSharpCode.Decompiler.Metadata;
 using ICSharpCode.Decompiler.Solution;
 using ICSharpCode.Decompiler.TypeSystem;
+using ICSharpCode.ILSpyX.MermaidDiagrammer;
 using ICSharpCode.ILSpyX.PdbProvider;
 
 using McMaster.Extensions.CommandLineUtils;
@@ -44,6 +45,13 @@ Examples:
     Decompile assembly to destination directory, create a project file, one source file per type, 
     into nicely nested directories.
         ilspycmd --nested-directories -p -o c:\decompiled sample.dll
+
+    Generate a HTML diagrammer containing all type info into a folder next to the input assembly
+        ilspycmd sample.dll --generate-diagrammer
+
+    Generate a HTML diagrammer containing filtered type info into a custom output folder
+    (including types in the LightJson namespace while excluding types in nested LightJson.Serialization namespace)
+        ilspycmd sample.dll --generate-diagrammer -o c:\diagrammer --generate-diagrammer-include LightJson\\..+ --generate-diagrammer-exclude LightJson\\.Serialization\\..+
 ")]
 	[HelpOption("-h|--help")]
 	[ProjectOptionRequiresOutputDirectoryValidation]
@@ -114,6 +122,46 @@ Examples:
 		[Option("--disable-updatecheck", "If using ilspycmd in a tight loop or fully automated scenario, you might want to disable the automatic update check.", CommandOptionType.NoValue)]
 		public bool DisableUpdateCheck { get; }
 
+		#region MermaidDiagrammer options
+
+		// reused or quoted commands
+		private const string generateDiagrammerCmd = "--generate-diagrammer",
+			exclude = generateDiagrammerCmd + "-exclude",
+			include = generateDiagrammerCmd + "-include";
+
+		[Option(generateDiagrammerCmd, "Generates an interactive HTML diagrammer app from selected types in the target assembly" +
+			" - to the --outputdir or in a 'diagrammer' folder next to to the assembly by default.", CommandOptionType.NoValue)]
+		public bool GenerateDiagrammer { get; }
+
+		[Option(include, "An optional regular expression matching Type.FullName used to whitelist types to include in the generated diagrammer.", CommandOptionType.SingleValue)]
+		public string Include { get; set; }
+
+		[Option(exclude, "An optional regular expression matching Type.FullName used to blacklist types to exclude from the generated diagrammer.", CommandOptionType.SingleValue)]
+		public string Exclude { get; set; }
+
+		[Option(generateDiagrammerCmd + "-report-excluded", "Outputs a report of types excluded from the generated diagrammer" +
+			$" - whether by default because compiler-generated, explicitly by '{exclude}' or implicitly by '{include}'." +
+			" You may find this useful to develop and debug your regular expressions.", CommandOptionType.NoValue)]
+		public bool ReportExludedTypes { get; set; }
+
+		[Option(generateDiagrammerCmd + "-docs", "The path or file:// URI of the XML file containing the target assembly's documentation comments." +
+			" You only need to set this if a) you want your diagrams annotated with them and b) the file name differs from that of the assmbly." +
+			" To enable XML documentation output for your assmbly, see https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/xmldoc/#create-xml-documentation-output",
+			CommandOptionType.SingleValue)]
+		public string XmlDocs { get; set; }
+
+		/// <inheritdoc cref="ILSpyX.MermaidDiagrammer.GenerateHtmlDiagrammer.StrippedNamespaces" />
+		[Option(generateDiagrammerCmd + "-strip-namespaces", "Optional space-separated namespace names that are removed for brevity from XML documentation comments." +
+			" Note that the order matters: e.g. replace 'System.Collections' before 'System' to remove both of them completely.", CommandOptionType.MultipleValue)]
+		public string[] StrippedNamespaces { get; set; }
+
+		[Option(generateDiagrammerCmd + "-json-only",
+			"Whether to generate a model.json file instead of baking it into the HTML template." +
+			" This is useful for the HTML/JS/CSS development loop.", CommandOptionType.NoValue,
+			ShowInHelpText = false)] // developer option, output is really only useful in combination with the corresponding task in html/gulpfile.js
+		public bool JsonOnly { get; set; }
+		#endregion
+
 		private readonly IHostEnvironment _env;
 		public ILSpyCmdProgram(IHostEnvironment env)
 		{
@@ -157,6 +205,26 @@ Examples:
 					SolutionCreator.WriteSolutionFile(Path.Combine(outputDirectory, Path.GetFileNameWithoutExtension(outputDirectory) + ".sln"), projects);
 					return 0;
 				}
+				else if (GenerateDiagrammer)
+				{
+					foreach (var file in InputAssemblyNames)
+					{
+						var command = new GenerateHtmlDiagrammer {
+							Assembly = file,
+							OutputFolder = OutputDirectory,
+							Include = Include,
+							Exclude = Exclude,
+							ReportExludedTypes = ReportExludedTypes,
+							JsonOnly = JsonOnly,
+							XmlDocs = XmlDocs,
+							StrippedNamespaces = StrippedNamespaces
+						};
+
+						command.Run();
+					}
+
+					return 0;
+				}
 				else
 				{
 					foreach (var file in InputAssemblyNames)