translation layer and serialization changes

Author: magiccodingman

Magic.IndexedDb/IndexDbManager.cs

@@ -204,15 +204,16 @@ internal IMagicDatabaseScoped Database(IndexedDbManager manager, IndexedDbSet in
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
         internal async Task<IEnumerable<T>?> LinqToIndexedDb<T>(
-            NestedOrFilter nestedOrFilter, MagicQuery<T> query,
+            FilterNode nestedOrFilter, MagicQuery<T> query,
             CancellationToken cancellationToken) where T : class
         {
-            if (nestedOrFilter.universalFalse == true)
-                return default;
+            //if (nestedOrFilter.universalFalse == true)
+            //    return default;
+
             var args = new ITypedArgument[] {
                 new TypedArgument<string>(query.DatabaseName),
                 new TypedArgument<string>(query.SchemaName),
-                new TypedArgument<NestedOrFilter>(nestedOrFilter),
+                new TypedArgument<FilterNode>(nestedOrFilter),
                 new TypedArgument<List<StoredMagicQuery>?>(query?.StoredMagicQueries),
                 new TypedArgument<bool>(query?.ForceCursorMode??false),
             };
@@ -235,16 +236,14 @@ internal IMagicDatabaseScoped Database(IndexedDbManager manager, IndexedDbSet in
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
         internal async IAsyncEnumerable<T?> LinqToIndexedDbYield<T>(
-    NestedOrFilter nestedOrFilter, MagicQuery<T> query,
+    FilterNode nestedOrFilter, MagicQuery<T> query,
     [EnumeratorCancellation] CancellationToken cancellationToken) where T : class
         {
-            if (nestedOrFilter.universalFalse == true)
-                yield break; // Terminate the async iterator immediately.
 
             var args = new ITypedArgument[] {
         new TypedArgument<string>(query.DatabaseName),
         new TypedArgument<string>(query.SchemaName),
-        new TypedArgument<NestedOrFilter>(nestedOrFilter),
+        new TypedArgument<FilterNode>(nestedOrFilter),
         new TypedArgument<List<StoredMagicQuery>?>(query?.StoredMagicQueries),
         new TypedArgument<bool>(query?.ForceCursorMode??false),
     };

Magic.IndexedDb/LinqTranslation/Extensions/MagicQueryExtensions.cs

@@ -12,6 +12,7 @@
 using System.Text.Json.Nodes;
 using System.Collections;
 using Magic.IndexedDb.Models.UniversalOperations;
+using Magic.IndexedDb.LinqTranslation.Models;
 
 namespace Magic.IndexedDb.LinqTranslation.Extensions
 {
@@ -66,7 +67,7 @@ public async Task<IEnumerable<T>> WhereAsync(
             return items.Where(predicate.Compile()); // Apply predicate after materialization
         }
 
-        private NestedOrFilter nestedOrFilter { get => GetCollectedBinaryJsonExpressions(); }
+        private FilterNode nestedOrFilter { get => GetCollectedBinaryJsonExpressions(); }
 
         /// <summary>
         /// The order you apply does get applied correctly in the query, 
@@ -209,26 +210,14 @@ private MemberExpression GetMemberExpressionFromLambda(Expression<Func<T, object
             }
         }
 
-        private NestedOrFilter GetCollectedBinaryJsonExpressions()
+        private FilterNode GetCollectedBinaryJsonExpressions()
         {
-            NestedOrFilter nestedOrFilter = new NestedOrFilter();
             Expression<Func<T, bool>> preprocessedPredicate = PreprocessPredicate();
 
-            // Check if the predicate is a universal false condition
-            if (IsUniversalFalse(preprocessedPredicate))
-            {
-                return new NestedOrFilter { universalFalse = true };
-            }
-
-            // FLATTEN OR CONDITIONS because they are annoying and IndexDB doesn't support that!
-            var flattenedPredicate = ExpressionFlattener.FlattenAndOptimize(preprocessedPredicate);
-
-            var builder = new UniversalExpressionBuilder<T>(flattenedPredicate);
-            nestedOrFilter = builder.Build();
-
 
-            //CollectBinaryExpressions(flattenedPredicate.Body, flattenedPredicate, nestedOrFilter);
-            return nestedOrFilter;
+            var builder = new UniversalExpressionBuilder<T>(preprocessedPredicate);
+            var result = builder.Build();
+            return result;
         }