Fallback serializer for rules.

Squidex · Nov 13, 2023 · aa76b22 · aa76b22
1 parent 138487b
commit aa76b22
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/cli/Squidex.CLI/Directory.Build.props b/cli/Squidex.CLI/Directory.Build.props
@@ -15,6 +15,6 @@
     <PackageTags>Squidex HeadlessCMS</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>11.2</Version>
+    <Version>11.3</Version>
   </PropertyGroup>
 </Project>
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsClient.cs
@@ -120,10 +120,14 @@ public async Task StreamAllAsync(Func<TEntity, Task> callback, int skip = 0, Que
                             throw new SquidexException("Line does not start with data prefix.");
                         }
 
-#pragma warning disable IDE0057 // Use range operator
-                        var contentJson = line.Substring(Prefix.Length);
-#pragma warning restore IDE0057 // Use range operator
-                        var contentItem = contentJson.FromJson<TEntity>();
+                        var stringReader = new StringReader(line);
+
+                        for (var i = 0; i < Prefix.Length; i++)
+                        {
+                            stringReader.Read();
+                        }
+
+                        var contentItem = stringReader.FromJson<TEntity>();
 
                         await callback(contentItem);
                     }

diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs
@@ -205,6 +205,7 @@ public SquidexOptions UseFallbackSerializer()
     {
         SerializerSettings.Converters.Add(ListFallbackConverter.Clients);
         SerializerSettings.Converters.Add(ListFallbackConverter.Languages);
+        SerializerSettings.Converters.Add(ListFallbackConverter.Rules);
         SerializerSettings.Converters.Add(ListFallbackConverter.Schemas);
         return this;
     }

diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/HttpClientExtensions.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/HttpClientExtensions.cs
@@ -119,6 +119,23 @@ public static T FromJson<T>(this string value)
         return json;
     }
 
+    /// <summary>
+    /// Read a value from a JSON string.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <param name="value">The JSON string.</param>
+    /// <returns>
+    /// The deserialized value.
+    /// </returns>
+    public static T FromJson<T>(this StringReader value)
+    {
+        using var jsonReader = new JsonTextReader(value);
+
+        var jsonSerializer = JsonSerializer.CreateDefault(SerializerSettings);
+
+        return jsonSerializer.Deserialize<T>(jsonReader)!;
+    }
+
     /// <summary>
     /// Read a value from a JSON string and uses explicit type name handling.
     /// </summary>

diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/ListFallbackConverter.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/ListFallbackConverter.cs
@@ -33,4 +33,11 @@ internal static class ListFallbackConverter
             {
                 Items = items
             });
+
+    public static readonly ListFallbackConverter<RulesDto, RuleDto> Rules =
+        new ListFallbackConverter<RulesDto, RuleDto>(
+            items => new RulesDto
+            {
+                Items = items
+            });
 }