update dependencies (#1211)

paranext · Oct 15, 2024 · b47a8f3 · b47a8f3
2 parents f9136ab + 19dd804
commit b47a8f3
Show file tree

Hide file tree

Showing 105 changed files with 4,580 additions and 1,623 deletions.
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -1,7 +1,11 @@
 // #region shared with https://github.com/paranext/paranext-multi-extension-template/blob/main/.stylelintrc.js and https://github.com/paranext/paranext-extension-template/blob/main/.stylelintrc.js
 
 module.exports = {
-  extends: ['stylelint-config-recommended', 'stylelint-config-sass-guidelines'],
+  extends: [
+    'stylelint-config-recommended',
+    'stylelint-config-sass-guidelines',
+    'stylelint-config-tailwindcss/scss',
+  ],
   overrides: [
     {
       files: ['**/*.scss'],

diff --git a/c-sharp/.config/dotnet-tools.json b/c-sharp/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.23.0",
+      "version": "0.29.2",
       "commands": ["dotnet-csharpier"]
     }
   }

diff --git a/c-sharp/Checks/CheckRunner.cs b/c-sharp/Checks/CheckRunner.cs
@@ -94,23 +94,20 @@ protected override ResponseToRequest HandleRequest(string functionName, JsonArra
 
             return functionName switch
             {
-                "disableCheck"
-                    => DisableCheck(
-                        args[0].Deserialize<string>() ?? "",
-                        args.Count > 1 ? args[1].Deserialize<string>() : null
-                    ),
-                "enableCheck"
-                    => EnableCheck(
-                        args[0].Deserialize<string>() ?? "",
-                        args[1].Deserialize<string>() ?? ""
-                    ),
+                "disableCheck" => DisableCheck(
+                    args[0].Deserialize<string>() ?? "",
+                    args.Count > 1 ? args[1].Deserialize<string>() : null
+                ),
+                "enableCheck" => EnableCheck(
+                    args[0].Deserialize<string>() ?? "",
+                    args[1].Deserialize<string>() ?? ""
+                ),
                 "getActiveRanges" => GetActiveRanges(),
                 "getAvailableChecks" => GetAvailableChecks(),
                 "getCheckResults" => GetCheckResults(),
-                "setActiveRanges"
-                    => SetActiveRanges(
-                        CheckInputRangeConverter.CreateCheckInputRangeArray(args[1])
-                    ),
+                "setActiveRanges" => SetActiveRanges(
+                    CheckInputRangeConverter.CreateCheckInputRangeArray(args[1])
+                ),
                 _ => ResponseToRequest.Failed($"Unknown function: {functionName}"),
             };
         }

diff --git a/c-sharp/JsonUtils/PrivateConstructorResolver.cs b/c-sharp/JsonUtils/PrivateConstructorResolver.cs
@@ -16,8 +16,8 @@ public override JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions option
         if (jsonTypeInfo is { Kind: JsonTypeInfoKind.Object, CreateObject: null })
         {
             if (
-                jsonTypeInfo.Type
-                    .GetConstructors(BindingFlags.Public | BindingFlags.Instance)
+                jsonTypeInfo
+                    .Type.GetConstructors(BindingFlags.Public | BindingFlags.Instance)
                     .All(c => c.GetParameters().Length > 0)
             )
             {

diff --git a/c-sharp/MessageHandlers/MessageHandlerRequestByRequestType.cs b/c-sharp/MessageHandlers/MessageHandlerRequestByRequestType.cs
@@ -1,6 +1,6 @@
-using Paranext.DataProvider.Messages;
 using System.Collections.Concurrent;
 using System.Text.Json;
+using Paranext.DataProvider.Messages;
 
 namespace Paranext.DataProvider.MessageHandlers;
 

diff --git a/c-sharp/Messages/MessageEventClientConnect.cs b/c-sharp/Messages/MessageEventClientConnect.cs
@@ -23,7 +23,7 @@ public MessageEventClientConnect(int clientId, bool didReconnect)
             new MessageEventClientConnectContents
             {
                 ClientId = clientId,
-                DidReconnect = didReconnect
+                DidReconnect = didReconnect,
             }
         ) { }
 }

diff --git a/c-sharp/Messages/MessageEventObjectCreated.cs b/c-sharp/Messages/MessageEventObjectCreated.cs
@@ -24,7 +24,7 @@ public MessageEventObjectCreated(string id, string objectType, string[] function
             {
                 Id = id,
                 ObjectType = objectType,
-                Functions = functions
+                Functions = functions,
             }
         ) { }
 }

diff --git a/c-sharp/Messages/MessageEventProjectDataProviderCreated.cs b/c-sharp/Messages/MessageEventProjectDataProviderCreated.cs
@@ -36,7 +36,7 @@ List<string> projectInterfaces
                 {
                     ProjectId = projectID,
                     ProjectInterfaces = projectInterfaces,
-                }
+                },
             }
         ) { }
 }

diff --git a/c-sharp/Messages/MessageEventProjectDataProviderFactoryCreated.cs b/c-sharp/Messages/MessageEventProjectDataProviderFactoryCreated.cs
@@ -34,7 +34,7 @@ List<string> projectInterfaces
                 Attributes = new ProjectDataProviderFactoryAttributes
                 {
                     ProjectInterfaces = projectInterfaces,
-                }
+                },
             }
         ) { }
 }

diff --git a/c-sharp/Messages/MessageResponse.cs b/c-sharp/Messages/MessageResponse.cs
@@ -33,7 +33,7 @@ string errorMessage
             RequestId = requestId,
             RequesterId = requesterId,
             Success = false,
-            ErrorMessage = errorMessage
+            ErrorMessage = errorMessage,
         };
     }
 
@@ -53,7 +53,7 @@ public static MessageResponse Succeeded(
             RequestId = requestId,
             RequesterId = requesterId,
             Success = true,
-            Contents = contents
+            Contents = contents,
         };
     }
 

diff --git a/c-sharp/NetworkObjects/DataProvider.cs b/c-sharp/NetworkObjects/DataProvider.cs
@@ -1,9 +1,9 @@
-using Paranext.DataProvider.MessageHandlers;
-using Paranext.DataProvider.Messages;
-using Paranext.DataProvider.MessageTransports;
 using System.Collections.Concurrent;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using Paranext.DataProvider.MessageHandlers;
+using Paranext.DataProvider.Messages;
+using Paranext.DataProvider.MessageTransports;
 
 namespace Paranext.DataProvider.NetworkObjects;
 

diff --git a/c-sharp/NetworkObjects/TimeDataProvider.cs b/c-sharp/NetworkObjects/TimeDataProvider.cs
@@ -38,10 +38,11 @@ protected override ResponseToRequest HandleRequest(string functionName, JsonArra
     {
         return functionName switch
         {
-            "getTime"
-                => ResponseToRequest.Succeeded(DateTime.Now.ToISO8601TimeFormatWithUTCString()),
+            "getTime" => ResponseToRequest.Succeeded(
+                DateTime.Now.ToISO8601TimeFormatWithUTCString()
+            ),
             "setTime" => ResponseToRequest.Failed("Cannot set the time"),
-            _ => ResponseToRequest.Failed($"Unexpected function: {functionName}")
+            _ => ResponseToRequest.Failed($"Unexpected function: {functionName}"),
         };
     }
 }
diff --git a/c-sharp/ParatextUtils/UsfmBookIndexer.cs b/c-sharp/ParatextUtils/UsfmBookIndexer.cs
@@ -24,7 +24,10 @@ public UsfmBookIndexer(string usfm)
 
     #region Properties
 
-    public string Usfm { get { return _usfm;} }
+    public string Usfm
+    {
+        get { return _usfm; }
+    }
 
     #endregion
 
@@ -119,19 +122,19 @@ private Dictionary<int, Dictionary<int, int>> BuildIndexes()
             if (_usfm[i] != '\\')
                 continue;
 
-            if (_usfm[i+1] == 'c')
+            if (_usfm[i + 1] == 'c')
             {
-                var chapterNumber = ExtractNumber(_usfm, i+2);
+                var chapterNumber = ExtractNumber(_usfm, i + 2);
                 if (chapterNumber.HasValue && chapterNumber.Value > 1)
                 {
                     onChapter = chapterNumber.Value;
                     retVal.Add(onChapter, []);
                     retVal[onChapter].Add(0, i);
                 }
             }
-            else if (_usfm[i+1] == 'v')
+            else if (_usfm[i + 1] == 'v')
             {
-                var verseNumber = ExtractNumber(_usfm, i+2);
+                var verseNumber = ExtractNumber(_usfm, i + 2);
                 if (verseNumber.HasValue)
                     retVal[onChapter].Add(verseNumber.Value, i);
             }

diff --git a/c-sharp/Projects/LocalParatextProjects.cs b/c-sharp/Projects/LocalParatextProjects.cs
@@ -25,15 +25,17 @@ internal class LocalParatextProjects
 
     private readonly List<string> _requiredProjectRootFiles = ["usfm.sty", "Attribution.md"];
 
-    private static readonly List<string> s_paratextProjectInterfaces = [
+    private static readonly List<string> s_paratextProjectInterfaces =
+    [
         ProjectInterfaces.BASE,
         ProjectInterfaces.USFM_BOOK,
         ProjectInterfaces.USFM_CHAPTER,
         ProjectInterfaces.USFM_VERSE,
         ProjectInterfaces.USX_BOOK,
         ProjectInterfaces.USX_CHAPTER,
         ProjectInterfaces.USX_VERSE,
-        ProjectInterfaces.PLAIN_TEXT_VERSE];
+        ProjectInterfaces.PLAIN_TEXT_VERSE,
+    ];
 
     public LocalParatextProjects()
     {
@@ -44,7 +46,10 @@ public LocalParatextProjects()
             "Paratext 9 Projects"
         );
 
-        Paratext9ProjectsFolder = Path.Join(Path.GetPathRoot(Environment.CurrentDirectory), "My Paratext 9 Projects");
+        Paratext9ProjectsFolder = Path.Join(
+            Path.GetPathRoot(Environment.CurrentDirectory),
+            "My Paratext 9 Projects"
+        );
     }
 
     #endregion
@@ -68,15 +73,18 @@ public virtual void Initialize(bool shouldIncludePT9ProjectsOnWindows)
             ParatextGlobals.Initialize(ProjectRootFolder);
 
             Console.WriteLine(
-                $"Projects loaded from {ProjectRootFolder}: {string.Join(",", GetScrTexts().Select(scrText => scrText.Name))}");
+                $"Projects loaded from {ProjectRootFolder}: {string.Join(",", GetScrTexts().Select(scrText => scrText.Name))}"
+            );
 
             // Read the projects in any locations other than project root folder
-            IEnumerable<ProjectDetails> otherProjectDetails =
-                LoadOtherProjectDetails(shouldIncludePT9ProjectsOnWindows);
+            IEnumerable<ProjectDetails> otherProjectDetails = LoadOtherProjectDetails(
+                shouldIncludePT9ProjectsOnWindows
+            );
 
             if (otherProjectDetails.Any())
                 Console.WriteLine(
-                    $"Projects found in other locations: {string.Join(",", otherProjectDetails.Select(projectDetails => projectDetails.Name))}");
+                    $"Projects found in other locations: {string.Join(",", otherProjectDetails.Select(projectDetails => projectDetails.Name))}"
+                );
 
             foreach (ProjectDetails projectDetails in otherProjectDetails)
             {
@@ -121,7 +129,7 @@ public static ScrText GetParatextProject(string projectId)
 
     public static List<string> GetParatextProjectInterfaces()
     {
-        return [..s_paratextProjectInterfaces];
+        return [.. s_paratextProjectInterfaces];
     }
 
     #endregion
@@ -149,7 +157,8 @@ protected static void CreateDirectory(string dir)
 
     #region Private properties and methods
 
-    private static IEnumerable<ScrText> GetScrTexts() {
+    private static IEnumerable<ScrText> GetScrTexts()
+    {
         return ScrTextCollection.ScrTexts(IncludeProjects.ScriptureOnly);
     }
 
@@ -160,7 +169,7 @@ private static void AddProjectToScrTextCollection(ProjectDetails projectDetails)
         var projectName = new ProjectName
         {
             ShortName = projectDetails.Name,
-            ProjectPath = projectPath
+            ProjectPath = projectPath,
         };
         ScrTextCollection.Add(new ScrText(projectName, RegistrationInfo.DefaultUser));
     }
@@ -169,19 +178,30 @@ private static void AddProjectToScrTextCollection(ProjectDetails projectDetails)
     /// Return projects that are available on disk on the local machine
     /// </summary>
     /// <returns>Enumeration of (ProjectMetadata, project directory) tuples for all projects</returns>
-    private IEnumerable<ProjectDetails> LoadOtherProjectDetails(bool shouldIncludePT9ProjectsOnWindows)
+    private IEnumerable<ProjectDetails> LoadOtherProjectDetails(
+        bool shouldIncludePT9ProjectsOnWindows
+    )
     {
         // Get project info for projects outside the normal project root folder
         List<string> nonPT9ProjectRootFolders = [];
-        if (OperatingSystem.IsWindows() && shouldIncludePT9ProjectsOnWindows && Directory.Exists(Paratext9ProjectsFolder)) nonPT9ProjectRootFolders.Add(Paratext9ProjectsFolder);
+        if (
+            OperatingSystem.IsWindows()
+            && shouldIncludePT9ProjectsOnWindows
+            && Directory.Exists(Paratext9ProjectsFolder)
+        )
+            nonPT9ProjectRootFolders.Add(Paratext9ProjectsFolder);
 
         foreach (var rootFolder in nonPT9ProjectRootFolders)
         {
             foreach (var dir in Directory.EnumerateDirectories(rootFolder))
             {
                 // There are a lot of folders with underscores in the name that we should ignore in
                 // My Paratext 9 Projects
-                if (rootFolder == Paratext9ProjectsFolder && Path.GetFileNameWithoutExtension(dir).StartsWith('_')) continue;
+                if (
+                    rootFolder == Paratext9ProjectsFolder
+                    && Path.GetFileNameWithoutExtension(dir).StartsWith('_')
+                )
+                    continue;
 
                 ProjectDetails? projectDetails;
                 string errorMessage;
@@ -224,7 +244,9 @@ out string errorMessage
         // https://github.com/ubsicap/Paratext/blob/aaadecd828a9b02e6f55d18e4c5dda8703ce2429/ParatextData/ScrText.cs#L258
         // Removing extension twice because file may be in form name.id.ext to match Paratext
         // https://github.com/ubsicap/Paratext/blob/aaadecd828a9b02e6f55d18e4c5dda8703ce2429/ParatextData/ScrTextCollection.cs#L1661
-        var shortName = Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(projectHomeDir));
+        var shortName = Path.GetFileNameWithoutExtension(
+            Path.GetFileNameWithoutExtension(projectHomeDir)
+        );
 
         var idNode = settings.SelectSingleNode("/ScriptureText/Guid");
         if (idNode == null)
@@ -267,10 +289,7 @@ private void SetUpSampleProject()
         {
             File.Copy(
                 filePath,
-                filePath.Replace(
-                    "assets/" + projectName,
-                    Path.Join(projectFolder)
-                )
+                filePath.Replace("assets/" + projectName, Path.Join(projectFolder))
             );
         }
     }