Post-merge rewrite.

Author: sarahelsaig

src/OrchardCoreContrib.PoExtractor/PluginHelper.cs

@@ -1,17 +1,32 @@
 using System.Reflection;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Microsoft.CodeAnalysis.Scripting;
+using OrchardCoreContrib.PoExtractor.DotNet;
+using OrchardCoreContrib.PoExtractor.DotNet.CS;
+using OrchardCoreContrib.PoExtractor.DotNet.VB;
+using OrchardCoreContrib.PoExtractor.Liquid;
+using OrchardCoreContrib.PoExtractor.Razor;
 
 namespace OrchardCoreContrib.PoExtractor;
 
 public static class PluginHelper
 {
     public static async Task ProcessPluginsAsync(
-        IList<string> plugins,
+        IEnumerable<string> plugins,
         List<IProjectProcessor> projectProcessors,
         List<string> projectFiles,
-        IEnumerable<Assembly> assemblies)
+        IEnumerable<Assembly> assemblies = null)
     {
+        assemblies ??=
+        [
+            typeof(IProjectProcessor).Assembly, // OrchardCoreContrib.PoExtractor.Abstractions
+            typeof(ExtractingCodeWalker).Assembly, // OrchardCoreContrib.PoExtractor.DotNet
+            typeof(CSharpProjectProcessor).Assembly, // OrchardCoreContrib.PoExtractor.DotNet.CS
+            typeof(VisualBasicProjectProcessor).Assembly, // OrchardCoreContrib.PoExtractor.DotNet.VB
+            typeof(LiquidProjectProcessor).Assembly, // OrchardCoreContrib.PoExtractor.Liquid
+            typeof(RazorProjectProcessor).Assembly, // OrchardCoreContrib.PoExtractor.Razor
+        ];
+        
         var sharedOptions = ScriptOptions.Default.AddReferences(assemblies);
 
         foreach (var plugin in plugins)

src/OrchardCoreContrib.PoExtractor/Program.cs

@@ -1,4 +1,6 @@
-using McMaster.Extensions.CommandLineUtils;
+using System.ComponentModel.DataAnnotations;
+using McMaster.Extensions.CommandLineUtils;
+using OrchardCore.Modules;
 using OrchardCoreContrib.PoExtractor.DotNet;
 using OrchardCoreContrib.PoExtractor.DotNet.CS;
 using OrchardCoreContrib.PoExtractor.DotNet.VB;
@@ -33,8 +35,18 @@ public static void Main(string[] args)
         var ignoredProjects = app.Option("-i|--ignore <IGNORED_PROJECTS>", "Ignores extracting PO files from a given project(s).", CommandOptionType.MultipleValue);
         var localizers = app.Option("--localizer <LOCALIZERS>", "Specifies the name of the localizer(s) that will be used during the extraction process.", CommandOptionType.MultipleValue);
         var single = app.Option("-s|--single <FILE_NAME>", "Specifies the single output file.", CommandOptionType.SingleValue);
-
-        app.OnExecute(() =>
+        var plugins = app.Option(
+            "-p|--plugin <FILE_NAME_OR_HTTPS_URL>",
+            "A path or web URL with HTTPS scheme to a C# script (.csx) file which can define further " +
+            "IProjectProcessor implementations. You can have multiple of this switch in a call.",
+            CommandOptionType.MultipleValue,
+            option => option.OnValidate(_ => option
+                .Values
+                .All(item => File.Exists(item) || item.StartsWithOrdinalIgnoreCase("https://"))
+                ? ValidationResult.Success
+                : new ValidationResult("Plugin must be an existing local file or a valid HTTPS URL.")));
+
+        app.OnExecuteAsync(async cancellationToken =>
         {
             if (!Directory.Exists(inputPath.Value))
             {
@@ -84,14 +96,21 @@ public static void Main(string[] args)
                 projectProcessors.Add(new LiquidProjectProcessor());
             }
 
+            if (plugins.Values.Count > 0)
+            {
+                await PluginHelper.ProcessPluginsAsync(plugins.Values, projectProcessors, projectFiles);
+            }
+
             var isSingleFileOutput = !string.IsNullOrEmpty(single.Value());
             var localizableStrings = new LocalizableStringCollection();
             foreach (var projectFile in projectFiles)
             {
                 var projectPath = Path.GetDirectoryName(projectFile);
                 var projectBasePath = Path.GetDirectoryName(projectPath) + Path.DirectorySeparatorChar;
                 var projectRelativePath = projectPath[projectBasePath.Length..];
-                var rootedProject = projectPath[(projectPath.IndexOf(inputPath.Value) + inputPath.Value.Length + 1)..];
+                var rootedProject = projectPath == inputPath.Value
+                    ? projectPath 
+                    : projectPath[(projectPath.IndexOf(inputPath.Value, StringComparison.Ordinal) + inputPath.Value.Length + 1)..];
                 if (IgnoredProject.ToList().Any(p => rootedProject.StartsWith(p)))
                 {
                     continue;

test/OrchardCoreContrib.PoExtractor.Tests/PluginTests.cs

@@ -19,7 +19,7 @@ public async Task ProcessPluginsBasicJsonLocalizationProcessor()
         var localizableStrings = new LocalizableStringCollection();
 
         // Act
-        await Program.ProcessPluginsAsync(plugins, projectProcessors, projectFiles);
+        await PluginHelper.ProcessPluginsAsync(plugins, projectProcessors, projectFiles);
         projectProcessors[0].Process(PluginTestFiles, Path.GetFileName(Environment.CurrentDirectory), localizableStrings);
 
         using (var writer = new PoWriter(stream))