fix: 修正一个页面变更导致的返回值节点获取失败

Author: stratosblue

Directory.Build.props

@@ -9,7 +9,7 @@
 
   <!--Package Info-->
   <PropertyGroup>
-    <VersionPrefix>1.2.2</VersionPrefix>
+    <VersionPrefix>1.2.3</VersionPrefix>
 
     <Description>a tool for generate and install Localized IntelliSense files. 用于生成和安装本地化IntelliSense文件的工具。</Description>
 

src/IntelliSenseLocalizer.Core/IntelliSenseLocalizer.Core.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BaseAnyEncoding" Version="1.0.1" />
+    <PackageReference Include="BaseAnyEncoding" Version="1.0.3" />
     <PackageReference Include="Cuture.Http" Version="2.8.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />

src/IntelliSenseLocalizer.Core/MSDocIntelliSenseItemUpdater.cs

@@ -164,7 +164,7 @@ static IEnumerable<HtmlNode> FindNode(HtmlNode _htmlNode)
             return _htmlNode.SelectNodes(".//p")
                         ?? _htmlNode.SelectNodes(".//li")
                         ?? (_htmlNode.Name == "p" ? new[] { _htmlNode }.AsEnumerable() : null)
-                        ?? new[] { HtmlNode.CreateNode("<p tags=\"emptyNode\" />") };
+                        ?? [HtmlNode.CreateNode("<p tags=\"emptyNode\" />")];
         }
 
         var contentLines = FindNode(htmlNode).Select(x => x.InnerHtml).ToArray();

src/IntelliSenseLocalizer.Core/Utils/MSDocPageAnalyser.cs

@@ -38,7 +38,7 @@ public static MSDocPageAnalysisResult[] AnalysisHtmlDocument(string url, HtmlDoc
             var version = intelliSenseItems.First().IntelliSenseFileDescriptor.Moniker[^3..];
 
             var memberRootNodes = htmlRootNode.SelectNodes("//div[@class=\"memberInfo\"]")?
-                                    .Where(x => x.ParentNode.Attributes["data-moniker"].Value.Split(" ").Any(z => z.EndsWith(version)));
+                                  .Where(x => x.ParentNode.Attributes["data-moniker"].Value.Split(" ").Any(z => z.EndsWith(version)));
             if (memberRootNodes?.Any() == true)
             {
                 return memberRootNodes.Select(x =>
@@ -50,12 +50,13 @@ public static MSDocPageAnalysisResult[] AnalysisHtmlDocument(string url, HtmlDoc
                 }).ToArray();
             }
 
-            var memberRootNode = htmlRootNode.SelectSingleNode("//div[@class=\"content \"]")?.SelectSingleNode(".//div[@class=\"summaryHolder\"]")?.ParentNode
-                                ?? htmlRootNode.SelectSingleNode("//div[@class=\"content\"]")?.SelectSingleNode(".//div[@class=\"summaryHolder\"]")?.ParentNode
-                                 ?? htmlRootNode.SelectSingleNode("//div[@class=\"content \"]")
-                                 ?? htmlRootNode.SelectSingleNode("//div[@class=\"content\"]");
+            //查找至少包含一个div子节点的 <div class="content"></div>
+            var memberRootNode = htmlRootNode.SelectSingleNode("//div[@class=\"content \"][div]")?.SelectSingleNode(".//div[@class=\"summaryHolder\"]")?.ParentNode
+                                ?? htmlRootNode.SelectSingleNode("//div[@class=\"content\"][div]")?.SelectSingleNode(".//div[@class=\"summaryHolder\"]")?.ParentNode
+                                 ?? htmlRootNode.SelectSingleNode("//div[@class=\"content \"][div]")
+                                 ?? htmlRootNode.SelectSingleNode("//div[@class=\"content\"][div]");
 
-            return new[] { CreatePageAnalysisResult(url, apiName, memberRootNode, intelliSenseItems) };
+            return [CreatePageAnalysisResult(url, apiName, memberRootNode, intelliSenseItems)];
         }
         else
         {
@@ -142,13 +143,13 @@ private static MSDocPageAnalysisResult CreatePageAnalysisResult(string url, stri
 
         if (currentGroupItem?.Element.GetReturnsNodes().Count > 0)
         {
-            returnNode = htmlNode.SelectSingleNode("./dl[@class=\"propertyInfo\"]/following-sibling::p")
+            returnNode = htmlNode.SelectSingleNode("./div[@class=\"propertyInfo\"]/following-sibling::p")
 
-                        ?? htmlNode.SelectNodes(".//h4")
-                                .ElementAtOrDefault(parameters.Any() ? 1 : 0)?
-                                .SelectSingleNode(".//following-sibling::p")
+                ?? htmlNode.SelectNodes(".//h4")
+                        .ElementAtOrDefault(parameters.Any() ? 1 : 0)?
+                        .SelectSingleNode(".//following-sibling::p")
 
-                        ?? HtmlNode.CreateNode("<p/>");
+                ?? HtmlNode.CreateNode("<p/>");
         }
 
         return new MSDocPageAnalysisResult(url, uniqueKey, parameters, fields)

src/IntelliSenseLocalizer/Commands/Program.BuildCommand.cs

@@ -51,14 +51,14 @@ internal partial class Program
 
     private static Command BuildBuildCommand()
     {
-        var packNameOption = new Option<string>(new[] { "-p", "--pack" }, Resources.StringCMDBuildOptionPackDescription);
-        var monikerOption = new Option<string>(new[] { "-m", "--moniker" }, Resources.StringCMDBuildOptionMonikerDescription);
-        var localeOption = new Option<string>(new[] { "-l", "--locale" }, () => LocalizerEnvironment.CurrentLocale, Resources.StringCMDBuildOptionLocaleDescription);
-        var contentCompareTypeOption = new Option<ContentCompareType>(new[] { "-cc", "--content-compare" }, () => ContentCompareType.OriginFirst, Resources.StringCMDBuildOptionContentCompareDescription);
-        var separateLineOption = new Option<string?>(new[] { "-sl", "--separate-line" }, Resources.StringCMDBuildOptionSeparateLineDescription);
-        var outputOption = new Option<string>(new[] { "-o", "--output" }, () => LocalizerEnvironment.OutputRoot, Resources.StringCMDBuildOptionOutputDescription);
-        var parallelCountOption = new Option<int>(new[] { "-pc", "--parallel-count" }, () => 2, Resources.StringCMDBuildOptionParallelCountDescription);
-        var nocacheOption = new Option<bool>(new[] { "-nc", "--no-cache" }, () => false, Resources.StringCMDBuildOptionNoCacheDescription);
+        var packNameOption = new Option<string>(["-p", "--pack"], Resources.StringCMDBuildOptionPackDescription);
+        var monikerOption = new Option<string>(["-m", "--moniker"], Resources.StringCMDBuildOptionMonikerDescription);
+        var localeOption = new Option<string>(["-l", "--locale"], () => LocalizerEnvironment.CurrentLocale, Resources.StringCMDBuildOptionLocaleDescription);
+        var contentCompareTypeOption = new Option<ContentCompareType>(["-cc", "--content-compare"], () => ContentCompareType.OriginFirst, Resources.StringCMDBuildOptionContentCompareDescription);
+        var separateLineOption = new Option<string?>(["-sl", "--separate-line"], Resources.StringCMDBuildOptionSeparateLineDescription);
+        var outputOption = new Option<string>(["-o", "--output"], () => LocalizerEnvironment.OutputRoot, Resources.StringCMDBuildOptionOutputDescription);
+        var parallelCountOption = new Option<int>(["-pc", "--parallel-count"], () => 2, Resources.StringCMDBuildOptionParallelCountDescription);
+        var nocacheOption = new Option<bool>(["-nc", "--no-cache"], () => false, Resources.StringCMDBuildOptionNoCacheDescription);
 
         var buildCommand = new Command("build", Resources.StringCMDBuildDescription)
         {

src/IntelliSenseLocalizer/Commands/Program.ShowCommand.cs

@@ -11,7 +11,7 @@ private static Command BuildShowCommand()
     {
         var showCommand = new Command("show", Resources.StringCMDShowDescription);
 
-        var filterOption = new Option<string>(new[] { "-f", "--filter" }, Resources.StringOptionFilterDescription);
+        var filterOption = new Option<string>(["-f", "--filter"], Resources.StringOptionFilterDescription);
 
         {
             var showInstalledApplicationPacksCommand = new Command("packs", Resources.StringCMDShowPacksDescription)
@@ -25,8 +25,8 @@ private static Command BuildShowCommand()
         }
 
         {
-            var packNameOption = new Option<string>(new[] { "-p", "--pack" }, Resources.StringCMDShowOptionPackDescription);
-            var monikerOption = new Option<string>(new[] { "-m", "--moniker" }, Resources.StringCMDShowOptionMonikerDescription);
+            var packNameOption = new Option<string>(["-p", "--pack"], Resources.StringCMDShowOptionPackDescription);
+            var monikerOption = new Option<string>(["-m", "--moniker"], Resources.StringCMDShowOptionMonikerDescription);
 
             var showInstalledApplicationPackRefsCommand = new Command("refs", Resources.StringCMDShowPackRefsDescription)
             {

src/IntelliSenseLocalizer/Commands/Program.UnInstallCommand.cs

@@ -14,7 +14,7 @@ private static Command BuildUnInstallCommand()
         var uninstallCommand = new Command("uninstall", Resources.StringCMDUnInstallDescription);
         Argument<string> monikerArgument = new("moniker", Resources.StringCMDUnInstallArgumentMonikerDescription);
         Argument<string> localeArgument = new("locale", () => LocalizerEnvironment.CurrentLocale, Resources.StringCMDUnInstallArgumentLocaleDescription);
-        Option<string> targetOption = new(new[] { "-t", "--target" }, () => LocalizerEnvironment.DefaultSdkRoot, Resources.StringCMDUnInstallOptionTargetDescription);
+        Option<string> targetOption = new(["-t", "--target"], () => LocalizerEnvironment.DefaultSdkRoot, Resources.StringCMDUnInstallOptionTargetDescription);
 
         uninstallCommand.Add(monikerArgument);
         uninstallCommand.Add(localeArgument);

src/IntelliSenseLocalizer/Program.cs

@@ -20,7 +20,7 @@ internal partial class Program
 {
     private static readonly LoggingLevelSwitch s_consoleLoggingLevelSwitch = new(LogEventLevel.Verbose);
 
-    private static readonly Option<int?> s_logLevelOption = new(new[] { "-ll", "--log-level" }, Resources.StringOptionLogLevelDescription);
+    private static readonly Option<int?> s_logLevelOption = new(["-ll", "--log-level"], Resources.StringOptionLogLevelDescription);
 
     private static Microsoft.Extensions.Logging.ILogger s_logger = null!;
 

src/SimpleTranslateServer/SimpleTranslateServer.csproj

@@ -16,7 +16,7 @@
 
   <ItemGroup Condition="'$(AotPublishing)' != 'true'">
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.*" />
-    <PackageReference Include="SwaggerUI.AspNetCore" Version="5.29.0" />
+    <PackageReference Include="SwaggerUI.AspNetCore" Version="5.29.4" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
   </ItemGroup>