Add template path configuration

src/AbpHelper.Core/AbpHelperCoreConsts.cs

@@ -0,0 +1,7 @@
+namespace EasyAbp.AbpHelper.Core
+{
+    internal static class AbpHelperCoreConsts
+    {
+        internal static readonly string TemplateResourcePathPrefix = "/Templates/";
+    }
+}

src/AbpHelper.Core/Commands/CommandOptionsBase.cs

@@ -1,5 +1,7 @@
 using System;
+using System.IO;
 using EasyAbp.AbpHelper.Core.Attributes;
+using EasyAbp.AbpHelper.Core.Extensions;
 
 namespace EasyAbp.AbpHelper.Core.Commands
 {
@@ -14,5 +16,26 @@ public abstract class CommandOptionsBase
 
         [Option("exclude", Description = "Exclude directories when searching files, arguments can contain a combination of valid literal path and wildcard (* and ?) characters. Use double asterisk(**) to search all directories. Example: --exclude *Folder1 Folder2/Folder* **/*Folder? **/*Folder*")]
         public virtual string[] Exclude { get; set; } = Array.Empty<string>();
+
+        [Option('t', "template-path", Description = "Prioritize loading template files in the path")]
+        public virtual string? TemplatePath { get; set; }
+
+        public virtual string MapTemplatePath(string subPath)
+        {
+            string resourcePathPrefix = AbpHelperCoreConsts.TemplateResourcePathPrefix;
+
+            if (string.IsNullOrWhiteSpace(TemplatePath))
+            {
+                return Path.Combine(new[] { resourcePathPrefix, subPath }).NormalizePath();
+            }
+
+            if (AbpHelperCoreConsts.TemplateResourcePathPrefix.StartsWith('/') ||
+                AbpHelperCoreConsts.TemplateResourcePathPrefix.StartsWith('\\'))
+            {
+                resourcePathPrefix = resourcePathPrefix.Substring(1);
+            }
+
+            return Path.Combine(new[] { TemplatePath!, resourcePathPrefix, subPath }).NormalizePath();
+        }
     }
 }

src/AbpHelper.Core/Commands/Generate/Controller/ControllerCommand.cs

@@ -33,7 +33,7 @@ protected override IActivityBuilder ConfigureBuild(ControllerCommandOption optio
                     step =>
                     {
                         step.VariableName = VariableNames.TemplateDirectory;
-                        step.ValueExpression = new LiteralExpression<string>("/Templates/Controller");
+                        step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Controller"));
                     })
                 .Then<IfElse>(
                     step => step.ConditionExpression = new JavaScriptExpression<bool>($"{OptionVariableName}.{nameof(ControllerCommandOption.SkipBuild)}"),

src/AbpHelper.Core/Commands/Generate/Crud/CrudCommand.cs

@@ -35,7 +35,7 @@ protected override IActivityBuilder ConfigureBuild(CrudCommandOption option, IAc
                     step =>
                     {
                         step.VariableName = VariableNames.TemplateDirectory;
-                        step.ValueExpression = new LiteralExpression<string>("/Templates/Crud");
+                        step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Crud"));
                     })
                 .Then<FileFinderStep>(
                     step => { step.SearchFileName = new LiteralExpression(entityFileName); })

src/AbpHelper.Core/Commands/Generate/Localization/LocalizationCommand.cs

@@ -28,7 +28,7 @@ protected override IActivityBuilder ConfigureBuild(LocalizationCommandOption opt
                     step =>
                     {
                         step.VariableName = VariableNames.TemplateDirectory;
-                        step.ValueExpression = new LiteralExpression<string>("/Templates/Localization");
+                        step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Localization"));
                     })
                 .Then<SetModelVariableStep>()
                 /* Add localization */

src/AbpHelper.Core/Commands/Generate/Methods/MethodsCommand.cs

@@ -44,7 +44,7 @@ protected override IActivityBuilder ConfigureBuild(MethodsCommandOption option,
                     step =>
                     {
                         step.VariableName = VariableNames.TemplateDirectory;
-                        step.ValueExpression = new LiteralExpression<string>("/Templates/Methods");
+                        step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Methods"));
                     })
                 .Then<FileFinderStep>(
                     step =>

src/AbpHelper.Core/Commands/Generate/Service/ServiceCommand.cs

@@ -38,7 +38,7 @@ protected override IActivityBuilder ConfigureBuild(ServiceCommandOption option,
                     step =>
                     {
                         step.VariableName = VariableNames.TemplateDirectory;
-                        step.ValueExpression = new LiteralExpression<string>("/Templates/Service");
+                        step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Service"));
                     })
                 .Then<SetModelVariableStep>()
                 .Then<GroupGenerationStep>(

src/AbpHelper.Core/Commands/Module/Add/AddCommand.cs

@@ -74,7 +74,7 @@ protected override IActivityBuilder ConfigureBuild(AddCommandOption option, IAct
                         step =>
                         {
                             step.VariableName = VariableNames.TemplateDirectory;
-                            step.ValueExpression = new LiteralExpression<string>("/Templates/Module");
+                            step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Module"));
                         })
                     .Then<SetVariable>(
                         step =>

src/AbpHelper.Core/Commands/Module/Remove/RemoveCommand.cs

@@ -69,7 +69,7 @@ protected override IActivityBuilder ConfigureBuild(RemoveCommandOption option, I
                         step =>
                         {
                             step.VariableName = VariableNames.TemplateDirectory;
-                            step.ValueExpression = new LiteralExpression<string>("/Templates/Module");
+                            step.ValueExpression = new LiteralExpression<string>(option.MapTemplatePath("Module"));
                         })
                     .Then<SetVariable>(
                         step =>

src/AbpHelper.Core/Extensions/FileProviderExtensions.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
+using System.Linq;
+using Volo.Abp.VirtualFileSystem;
 
 namespace EasyAbp.AbpHelper.Core.Extensions
 {
@@ -26,5 +28,56 @@ public static class FileProviderExtensions
                 }
             }
         }
+
+        public static IEnumerable<(string, IFileInfo)> GetFilesRecursively(this IVirtualFileProvider fileProvider, string dir)
+        {
+            var (virtualDirectory, physicalDirectory) = fileProvider.GetTemplateRootDirectoryMirror(dir);
+            var files = GetFilesRecursively((IFileProvider)fileProvider, virtualDirectory);
+            if (physicalDirectory == null)
+            {
+                return files;
+            }
+            var physicalFiles = new PhysicalFileProvider(physicalDirectory).GetFilesRecursively("").ToList();
+            var virtualFiles = files.ToList();
+            var physicalPaths = new HashSet<string>(physicalFiles.Select(p => p.Item1));
+            return physicalFiles.Concat(virtualFiles.Where(v => !physicalPaths.Contains(v.Item1)));
+        }
+
+        /// <summary>
+        /// If <paramref name="dir"/> is physical path try to get virtual directory path
+        /// </summary>
+        /// <param name="dir"></param>
+        /// <returns>(virtualDirectory, physicalDirectory)</returns>
+        public static (string, string?) GetTemplateRootDirectoryMirror(this IVirtualFileProvider fileProvider, string dir)
+        {
+            if (dir.StartsWith(AbpHelperCoreConsts.TemplateResourcePathPrefix)) return (dir, null);
+
+            var index = dir.IndexOf(AbpHelperCoreConsts.TemplateResourcePathPrefix);
+
+            if (index == -1) return (dir, null);
+
+            var virtualDirectory = dir.Substring(index);
+            var physicalDirectory = dir.Substring(0, index);
+
+            return (virtualDirectory, physicalDirectory);
+        }
+
+        /// <summary>
+        /// If <paramref name="dir"/> is physical path try to get virtual directory path
+        /// </summary>
+        /// <param name="dir"></param>
+        /// <returns>(virtualDirectory, physicalDirectory)</returns>
+        public static (string, string?) GetTemplatePathMirror(this IVirtualFileProvider fileProvider, string dir)
+        {
+            if (dir.StartsWith(AbpHelperCoreConsts.TemplateResourcePathPrefix)) return (dir, null);
+
+            var index = dir.IndexOf(AbpHelperCoreConsts.TemplateResourcePathPrefix);
+
+            if (index == -1) return (dir, null);
+
+            var virtualPath = dir.Substring(index);
+
+            return (virtualPath, dir);
+        }
     }
 }

src/AbpHelper.Core/Generator/TemplateLoader.cs

@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
+using EasyAbp.AbpHelper.Core.Extensions;
 using Microsoft.Extensions.FileProviders;
 using Scriban;
 using Scriban.Parsing;
@@ -24,12 +26,22 @@ public string GetPath(TemplateContext context, SourceSpan callerSpan, string tem
 
         public string Load(TemplateContext context, SourceSpan callerSpan, string templatePath)
         {
-            return _virtualFileProvider.GetFileInfo(templatePath).ReadAsString();
+            var (v, p) = _virtualFileProvider.GetTemplatePathMirror(templatePath);
+            if (p != null && File.Exists(p))
+            {
+                return File.ReadAllText(p);
+            }
+            return _virtualFileProvider.GetFileInfo(v).ReadAsString();
         }
 
         public async ValueTask<string> LoadAsync(TemplateContext context, SourceSpan callerSpan, string templatePath)
         {
-            return await _virtualFileProvider.GetFileInfo(templatePath).ReadAsStringAsync();
+            var (v, p) = _virtualFileProvider.GetTemplatePathMirror(templatePath);
+            if (p != null && File.Exists(p))
+            {
+                return await File.ReadAllTextAsync(p);
+            }
+            return await _virtualFileProvider.GetFileInfo(v).ReadAsStringAsync();
         }
     }
 }

src/AbpHelper.Core/Generator/TextGenerator.cs

@@ -26,12 +26,22 @@ public string GenerateByTemplateName(string templateDirectory, string templateNa
         {
             return GenerateByTemplateName(templateDirectory, templateName, model, out _);
         }
-        
+
         public string GenerateByTemplateName(string templateDirectory, string templateName, object model, out TemplateContext context)
         {
             string path = Path.Combine(templateDirectory, templateName).NormalizePath();
-            var templateFile = _virtualFileProvider.GetFileInfo(path);
-            var templateText = templateFile.ReadAsString();
+            var templateText = string.Empty;
+            if (File.Exists(path))
+            {
+                templateText = File.ReadAllText(path);
+            }
+            else
+            {
+                var (virtualPath, _) = _virtualFileProvider.GetTemplateRootDirectoryMirror(path);
+
+                var templateFile = _virtualFileProvider.GetFileInfo(virtualPath);
+                templateText = templateFile.ReadAsString();
+            }
             return GenerateByTemplateText(templateText, model, out context);
         }
 

src/AbpHelper.Core/Steps/Common/GroupGenerationStep.cs

@@ -27,7 +27,7 @@ public WorkflowExpression<string> TemplateDirectory
             get => GetState<WorkflowExpression<string>>(() => new JavaScriptExpression<string>(VariableNames.TemplateDirectory));
             set => SetState(value);
         }
-        
+
         public string GroupName
         {
             get => GetState<string>();
@@ -80,10 +80,12 @@ protected override async Task<ActivityExecutionResult> OnExecuteAsync(WorkflowEx
 
         private async Task GenerateFile(string groupDirectory, string targetDirectory, object model, bool overwrite)
         {
+            var (virtualDirectory, physicalDirectory) = _virtualFileProvider.GetTemplateRootDirectoryMirror(groupDirectory);
+
             foreach (var (path, file) in _virtualFileProvider.GetFilesRecursively(groupDirectory))
             {
                 Logger.LogDebug($"Generating using template file: {path}");
-                var targetFilePathNameTemplate = path.Replace(groupDirectory, targetDirectory);
+                var targetFilePathNameTemplate = path.Replace(virtualDirectory, targetDirectory);
                 var targetFilePathName = _textGenerator.GenerateByTemplateText(targetFilePathNameTemplate, model);
                 if (File.Exists(targetFilePathName) && !overwrite)
                 {