Updated dependencies and unit tests

Duet3D · Feb 14, 2024 · 03ddf8f · 03ddf8f
1 parent 2fecc1c
commit 03ddf8f
Show file tree

Hide file tree

Showing 22 changed files with 1,047 additions and 1,044 deletions.
diff --git a/README.md b/README.md
@@ -243,7 +243,6 @@ To ensure flawless operation of the most critical components, Duet Software Fram
 ## Known incompatibilities
 
 - G-Code checksums and M998 are not supported
-- `exists()` may be used in meta G-code expressions only for fields that are managed by RRF
 
 ## Reporting issues
 

diff --git a/src/Documentation/Documentation.csproj b/src/Documentation/Documentation.csproj
@@ -2,11 +2,4 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="docfx.console" Version="2.59.4">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
 </Project>
diff --git a/src/DuetAPI/DuetAPI.csproj b/src/DuetAPI/DuetAPI.csproj
@@ -26,6 +26,6 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Text.Json" Version="6.0.8" />
+		<PackageReference Include="System.Text.Json" Version="6.0.9" />
 	</ItemGroup>
 </Project>
diff --git a/src/DuetControlServer/Commands/Generic/EvaluateExpression.cs b/src/DuetControlServer/Commands/Generic/EvaluateExpression.cs
@@ -24,7 +24,7 @@ public sealed class EvaluateExpression : DuetAPI.Commands.EvaluateExpression
             }
 
             // Attempt to evaluate the expression internally and pass it on to RRF otherwise
-            return await Model.Expressions.EvaluateExpressionRaw(new Code() { Channel = Channel }, Expression, false, false);
+            return await Model.Expressions.EvaluateExpressionRaw(new Code() { Channel = Channel }, Expression, false);
         }
     }
 }
diff --git a/src/DuetControlServer/DuetControlServer.csproj b/src/DuetControlServer/DuetControlServer.csproj
@@ -27,8 +27,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-		<PackageReference Include="NLog" Version="5.2.5" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
+		<PackageReference Include="NLog" Version="5.2.8" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
 		<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
 	</ItemGroup>
 

diff --git a/src/DuetControlServer/Model/Expressions.cs b/src/DuetControlServer/Model/Expressions.cs
@@ -378,16 +378,15 @@ public static bool IsSbcExpression(string expression, bool isFunction)
         /// </summary>
         private static readonly object _nullResult = new();
 
-        // Encode a string
-        private static string encodeString(string value)
-        {
-            return '"' + value.Replace("\"", "\"\"").Replace("'", "''") + '"';
-        }
-
         // Convert an object to a string value
 #warning This function cannot output empty arrays yet
-        private static string objectToString(object? obj, bool wantsCount, bool encodeStrings, Code code)
+        private static string ObjectToString(object? obj, bool wantsCount, bool encodeStrings, Code code)
         {
+            static string encodeString(string value)
+            {
+                return '"' + value.Replace("\"", "\"\"").Replace("'", "''") + '"';
+            }
+
             if (obj is null)
             {
                 return "null";
@@ -462,7 +461,7 @@ private static string objectToString(object? obj, bool wantsCount, bool encodeSt
             }
             if (obj is object[] objectArray)
             {
-                return '{' + string.Join(',', objectArray.Select(objectValue => objectToString(objectValue, false, true, code))) + (objectArray.Length == 1 ? ",}" : "}");
+                return '{' + string.Join(',', objectArray.Select(objectValue => ObjectToString(objectValue, false, true, code))) + (objectArray.Length == 1 ? ",}" : "}");
             }
             if (!wantsCount && obj is IList)
             {
@@ -481,10 +480,9 @@ private static string objectToString(object? obj, bool wantsCount, bool encodeSt
         /// <param name="code">Code holding the expression(s)</param>
         /// <param name="expression">Expression(s) to replace</param>
         /// <param name="onlySbcFields">Whether to replace only SBC fields</param>
-        /// <param name="encodeResult">Whether the final result shall be encoded</param>
         /// <returns>Replaced expression(s)</returns>
         /// <exception cref="CodeParserException">Failed to parse expression(s)</exception>
-        public static async Task<object?> EvaluateExpressionRaw(Code code, string expression, bool onlySbcFields, bool encodeResult)
+        public static async Task<object?> EvaluateExpressionRaw(Code code, string expression, bool onlySbcFields)
         {
             int i = 0;
 
@@ -576,7 +574,7 @@ async Task appendToken(StringBuilder result, StringBuilder lastToken)
                             {
                                 if (Filter.GetSpecific(filterString, true, out object? sbcField))
                                 {
-                                    string subResult = objectToString(sbcField, wantsCount, true, code);
+                                    string subResult = ObjectToString(sbcField, wantsCount, true, code);
                                     result.Append(subResult);
                                 }
                                 else
@@ -753,7 +751,7 @@ async Task<string> eatExpression(char brace, bool raw = false)
                                 }
                                 fnResult = await fn!(code.Channel, functionName, arguments.ToArray());
                             }
-                            result.Append(objectToString(fnResult, wantsCount, true, code));
+                            result.Append(ObjectToString(fnResult, wantsCount, true, code));
                         }
                         else
                         {
@@ -875,8 +873,8 @@ async Task<string> eatExpression(char brace, bool raw = false)
         /// <exception cref="CodeParserException">Failed to parse expression(s)</exception>
         public static async Task<string> EvaluateExpression(Code code, string expression, bool onlySbcFields, bool encodeResult)
         {
-            object? result = await EvaluateExpressionRaw(code, expression, onlySbcFields, encodeResult);
-            return (onlySbcFields && result is string resultString) ? resultString : objectToString(result, false, encodeResult, code);
+            object? result = await EvaluateExpressionRaw(code, expression, onlySbcFields);
+            return (onlySbcFields && result is string resultString) ? resultString : ObjectToString(result, false, encodeResult, code);
         }
     }
 }
diff --git a/src/DuetPluginService/DuetPluginService.csproj b/src/DuetPluginService/DuetPluginService.csproj
@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="NLog" Version="5.2.8" />
 	</ItemGroup>
 
 	<ItemGroup>