Unified abp-style and abp-script tag helpers.

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleContributorTagHelper.cs

@@ -1,19 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-{
-    [HtmlTargetElement("abp-bundle-contributor", TagStructure = TagStructure.NormalOrSelfClosing, ParentTag = "abp-style-bundle")]
-    [HtmlTargetElement("abp-bundle-contributor", TagStructure = TagStructure.NormalOrSelfClosing, ParentTag = "abp-script-bundle")]
-    public class AbpBundleContributorTagHelper : AbpTagHelper<AbpBundleContributorTagHelper, AbpBundleContributorTagHelperService>
-    {
-        public Type Type { get; set; }
-
-        public AbpBundleContributorTagHelper(AbpBundleContributorTagHelperService service)
-            : base(service)
-        {
-
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleContributorTagHelperService.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-{
-    public class AbpBundleContributorTagHelperService : AbpTagHelperService<AbpBundleContributorTagHelper>
-    {
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            output.SuppressOutput();
-
-            var files = (List<BundleTagHelperItem>)context.Items[AbpTagHelperConsts.ContextBundleItemListKey];
-            files.Add(new BundleTagHelperItem(TagHelper.Type));
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelper.cs

@@ -1,18 +0,0 @@
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-{
-    [HtmlTargetElement("abp-bundle-file", TagStructure = TagStructure.NormalOrSelfClosing, ParentTag = "abp-style-bundle")]
-    [HtmlTargetElement("abp-bundle-file", TagStructure = TagStructure.NormalOrSelfClosing, ParentTag = "abp-script-bundle")]
-    public class AbpBundleFileTagHelper : AbpTagHelper<AbpBundleFileTagHelper, AbpBundleFileTagHelperService>
-    {
-        public string Src { get; set; }
-
-        public AbpBundleFileTagHelper(AbpBundleFileTagHelperService service) 
-            : base(service)
-        {
-
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleFileTagHelperService.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-{
-    public class AbpBundleFileTagHelperService : AbpTagHelperService<AbpBundleFileTagHelper>
-    {
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            output.SuppressOutput();
-
-            var files = (List<BundleTagHelperItem>)context.Items[AbpTagHelperConsts.ContextBundleItemListKey];
-            files.Add(new BundleTagHelperItem(TagHelper.Src));
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs

@@ -1,63 +1,28 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     public abstract class AbpBundleTagHelperServiceBase<TTagHelper> : AbpTagHelperService<TTagHelper>
         where TTagHelper : TagHelper, IBundleTagHelper
     {
-        protected IBundleManager BundleManager { get; }
+        protected AbpTagHelperResourceHelper ResourceHelper { get; }
-        protected IHybridWebRootFileProvider WebRootFileProvider { get; }
 
-        protected AbpBundleTagHelperServiceBase(IBundleManager bundleManager, IHybridWebRootFileProvider webRootFileProvider)
+        protected AbpBundleTagHelperServiceBase(AbpTagHelperResourceHelper resourceHelper)
         {
-            BundleManager = bundleManager;
+            ResourceHelper = resourceHelper;
-            WebRootFileProvider = webRootFileProvider;
         }
 
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            output.TagName = null;
+            await ResourceHelper.ProcessAsync(
-
+                context,
-            var files = await GetBundleItems(context, output);
+                output,
-
+                TagHelper.GetNameOrNull(),
-            var bundleName = TagHelper.GetNameOrNull();
+                await GetBundleItems(context, output)
-            if (bundleName.IsNullOrEmpty())
+            );
-            {
-                bundleName = GenerateBundleName(files);
-            }
-
-            CreateBundle(bundleName, files);
-
-            var bundleFiles = GetBundleFiles(bundleName);
-
-            output.Content.Clear();
-
-            foreach (var bundleFile in bundleFiles)
-            {
-                var file = WebRootFileProvider.GetFileInfo(bundleFile);
-                if (file == null)
-                {
-                    throw new AbpException($"Could not find the bundle file from {nameof(IHybridWebRootFileProvider)}");
-                }
-
-                AddHtmlTag(context, output, bundleFile + "?_v=" + file.LastModified.UtcTicks);
-            }
-        }
-
-        protected abstract void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems);
-
-        protected abstract IReadOnlyList<string> GetBundleFiles(string bundleName);
-
-        protected abstract void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file);
-
-        protected virtual string GenerateBundleName(List<BundleTagHelperItem> bundleItems)
-        {
-            return bundleItems.JoinAsString("|").ToMd5();
         }
 
         protected virtual async Task<List<BundleTagHelperItem>> GetBundleItems(TagHelperContext context, TagHelperOutput output)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs

@@ -1,38 +1,10 @@
-using System;
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     public class AbpScriptBundleTagHelperService : AbpBundleTagHelperServiceBase<AbpScriptBundleTagHelper>
     {
-        public AbpScriptBundleTagHelperService(
+        public AbpScriptBundleTagHelperService(AbpTagHelperScriptHelper resourceHelper) 
-            IBundleManager bundleManager,
+            : base(resourceHelper)
-            IHybridWebRootFileProvider webRootFileProvider)
-            : base(
-                bundleManager, 
-                webRootFileProvider)
         {
-
-        }
-
-        protected override void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems)
-        {
-            BundleManager.CreateScriptBundle(
-                bundleName,
-                configuration => bundleItems.ForEach(bi => bi.AddToConfiguration(configuration))
-            );
-        }
-
-        protected override IReadOnlyList<string> GetBundleFiles(string bundleName)
-        {
-            return BundleManager.GetScriptBundleFiles(bundleName);
-        }
-
-        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
-        {
-            output.Content.AppendHtml($"<script src=\"{file}\" type=\"text/javascript\"></script>{Environment.NewLine}");
         }
     }
 }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptTagHelperService.cs

@@ -1,48 +1,39 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public class AbpScriptTagHelperService : AbpBundleTagHelperServiceBase<AbpScriptTagHelper>
+    public class AbpScriptTagHelperService : AbpTagHelperService<AbpScriptTagHelper>
     {
-        public AbpScriptTagHelperService(
+        protected AbpTagHelperScriptHelper ResourceHelper { get; }
-            IBundleManager bundleManager, 
-            IHybridWebRootFileProvider webRootFileProvider) 
-            : base(
-                bundleManager, 
-                webRootFileProvider)
-        {
-        }
-
-        //TODO: CreateBundle, GetBundleFiles & AddHtmlTag are identical with the AbpScriptBundleTagHelperService. Try to remove duplication!
-
-        protected override void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems)
-        {
-            BundleManager.CreateScriptBundle(
-                bundleName,
-                configuration => bundleItems.ForEach(bi => bi.AddToConfiguration(configuration))
-            );
-        }
 
-        protected override IReadOnlyList<string> GetBundleFiles(string bundleName)
+        public AbpScriptTagHelperService(AbpTagHelperScriptHelper resourceHelper)
         {
-            return BundleManager.GetScriptBundleFiles(bundleName);
+            ResourceHelper = resourceHelper;
         }
 
-        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            output.Content.AppendHtml($"<script src=\"{file}\" type=\"text/javascript\"></script>{Environment.NewLine}");
+            var tagHelperItems = context.Items.GetOrDefault(AbpTagHelperConsts.ContextBundleItemListKey) as List<BundleTagHelperItem>;
-        }
+            if (tagHelperItems != null)
-
+            {
-        protected override Task<List<BundleTagHelperItem>> GetBundleItems(TagHelperContext context, TagHelperOutput output)
+                output.SuppressOutput();
-        {
+                tagHelperItems.Add(TagHelper.CreateBundleTagHelperItem());
-            return Task.FromResult(new List<BundleTagHelperItem>
+            }
+            else
             {
-                TagHelper.CreateBundleTagHelperItem()
+                await ResourceHelper.ProcessAsync(
-            });
+                    context,
+                    output,
+                    TagHelper.GetNameOrNull(),
+                    new List<BundleTagHelperItem>
+                    {
+                        TagHelper.CreateBundleTagHelperItem()
+                    }
+                );
+            }
         }
     }
 }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs

@@ -1,38 +1,10 @@
-using System;
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     public class AbpStyleBundleTagHelperService : AbpBundleTagHelperServiceBase<AbpStyleBundleTagHelper>
     {
-        public AbpStyleBundleTagHelperService(
+        public AbpStyleBundleTagHelperService(AbpTagHelperStyleHelper resourceHelper) 
-            IBundleManager bundleManager,
+            : base(resourceHelper)
-            IHybridWebRootFileProvider webRootFileProvider)
-        : base(
-            bundleManager, 
-            webRootFileProvider)
         {
-
-        }
-
-        protected override void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems)
-        {
-            BundleManager.CreateStyleBundle(
-                bundleName,
-                configuration => bundleItems.ForEach(bi => bi.AddToConfiguration(configuration))
-            );
-        }
-
-        protected override IReadOnlyList<string> GetBundleFiles(string bundleName)
-        {
-            return BundleManager.GetStyleBundleFiles(bundleName);
-        }
-
-        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
-        {
-            output.Content.AppendHtml($"<link rel=\"stylesheet\" type=\"text/css\" href=\"{file}\" />{Environment.NewLine}");
         }
     }
 }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleTagHelperService.cs

@@ -1,48 +1,39 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public class AbpStyleTagHelperService : AbpBundleTagHelperServiceBase<AbpStyleTagHelper>
+    public class AbpStyleTagHelperService : AbpTagHelperService<AbpStyleTagHelper>
     {
-        public AbpStyleTagHelperService(
+        protected AbpTagHelperStyleHelper ResourceHelper { get; }
-            IBundleManager bundleManager, 
-            IHybridWebRootFileProvider webRootFileProvider) 
-            : base(
-                bundleManager, 
-                webRootFileProvider)
-        {
-        }
-
-        //TODO: CreateBundle, GetBundleFiles & AddHtmlTag are identical with the AbpStyleBundleTagHelperService. Try to remove duplication!
-
-        protected override void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems)
-        {
-            BundleManager.CreateStyleBundle(
-                bundleName,
-                configuration => bundleItems.ForEach(bi => bi.AddToConfiguration(configuration))
-            );
-        }
 
-        protected override IReadOnlyList<string> GetBundleFiles(string bundleName)
+        public AbpStyleTagHelperService(AbpTagHelperStyleHelper resourceHelper)
         {
-            return BundleManager.GetStyleBundleFiles(bundleName);
+            ResourceHelper = resourceHelper;
         }
 
-        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            output.Content.AppendHtml($"<link rel=\"stylesheet\" type=\"text/css\" href=\"{file}\" />{Environment.NewLine}");
+            var tagHelperItems = context.Items.GetOrDefault(AbpTagHelperConsts.ContextBundleItemListKey) as List<BundleTagHelperItem>;
-        }
+            if (tagHelperItems != null)
-
+            {
-        protected override Task<List<BundleTagHelperItem>> GetBundleItems(TagHelperContext context, TagHelperOutput output)
+                output.SuppressOutput();
-        {
+                tagHelperItems.Add(TagHelper.CreateBundleTagHelperItem());
-            return Task.FromResult(new List<BundleTagHelperItem>
+            }
+            else
             {
-                TagHelper.CreateBundleTagHelperItem()
+                await ResourceHelper.ProcessAsync(
-            });
+                    context,
+                    output,
+                    TagHelper.GetNameOrNull(),
+                    new List<BundleTagHelperItem>
+                    {
+                        TagHelper.CreateBundleTagHelperItem()
+                    }
+                );
+            }
         }
     }
 }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceHelper.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.VirtualFileSystem;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
+{
+    public abstract class AbpTagHelperResourceHelper : ITransientDependency
+    {
+        protected IBundleManager BundleManager { get; }
+        protected IHybridWebRootFileProvider WebRootFileProvider { get; }
+
+        protected AbpTagHelperResourceHelper(
+            IBundleManager bundleManager, 
+            IHybridWebRootFileProvider webRootFileProvider)
+        {
+            BundleManager = bundleManager;
+            WebRootFileProvider = webRootFileProvider;
+        }
+
+        public virtual async Task ProcessAsync(
+            TagHelperContext context, 
+            TagHelperOutput output, 
+            string bundleName,
+            List<BundleTagHelperItem> files)
+        {
+            output.TagName = null;
+
+            if (bundleName.IsNullOrEmpty())
+            {
+                bundleName = GenerateBundleName(files);
+            }
+
+            CreateBundle(bundleName, files);
+
+            var bundleFiles = GetBundleFiles(bundleName);
+
+            output.Content.Clear();
+
+            foreach (var bundleFile in bundleFiles)
+            {
+                var file = WebRootFileProvider.GetFileInfo(bundleFile);
+                if (file == null)
+                {
+                    throw new AbpException($"Could not find the bundle file from {nameof(IHybridWebRootFileProvider)}");
+                }
+
+                AddHtmlTag(context, output, bundleFile + "?_v=" + file.LastModified.UtcTicks);
+            }
+        }
+
+        protected abstract void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems);
+
+        protected abstract IReadOnlyList<string> GetBundleFiles(string bundleName);
+
+        protected abstract void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file);
+
+        protected virtual string GenerateBundleName(List<BundleTagHelperItem> bundleItems)
+        {
+            return bundleItems.JoinAsString("|").ToMd5();
+        }
+    }
+
+    public class AbpTagHelperScriptHelper : AbpTagHelperResourceHelper
+    {
+        public AbpTagHelperScriptHelper(
+            IBundleManager bundleManager, 
+            IHybridWebRootFileProvider webRootFileProvider
+            ) : base(
+            bundleManager, 
+            webRootFileProvider)
+        {
+        }
+
+        protected override void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems)
+        {
+            BundleManager.CreateScriptBundle(
+                bundleName,
+                configuration => bundleItems.ForEach(bi => bi.AddToConfiguration(configuration))
+            );
+        }
+
+        protected override IReadOnlyList<string> GetBundleFiles(string bundleName)
+        {
+            return BundleManager.GetScriptBundleFiles(bundleName);
+        }
+
+        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
+        {
+            output.Content.AppendHtml($"<script src=\"{file}\" type=\"text/javascript\"></script>{Environment.NewLine}");
+        }
+    }
+
+    public class AbpTagHelperStyleHelper : AbpTagHelperResourceHelper
+    {
+        public AbpTagHelperStyleHelper(
+            IBundleManager bundleManager, 
+            IHybridWebRootFileProvider webRootFileProvider
+            ) : base(
+            bundleManager, 
+            webRootFileProvider)
+        {
+        }
+
+        protected override void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems)
+        {
+            BundleManager.CreateStyleBundle(
+                bundleName,
+                configuration => bundleItems.ForEach(bi => bi.AddToConfiguration(configuration))
+            );
+        }
+
+        protected override IReadOnlyList<string> GetBundleFiles(string bundleName)
+        {
+            return BundleManager.GetStyleBundleFiles(bundleName);
+        }
+
+        protected override void AddHtmlTag(TagHelperContext context, TagHelperOutput output, string file)
+        {
+            output.Content.AppendHtml($"<link rel=\"stylesheet\" type=\"text/css\" href=\"{file}\" />{Environment.NewLine}");
+        }
+    }
+}