FOR operator work

Author: quinchs

examples/EdgeDB.Examples.ExampleApp/Examples/QueryBuilder.cs

@@ -31,6 +31,30 @@ public async Task ExecuteAsync(EdgeDBClient client)
 
         private static async Task QueryBuilderDemo(EdgeDBClient client)
         {
+            var set = new List<LinkPerson>()
+            {
+                new LinkPerson
+                {
+                    Email = "email1@example.com",
+                    Name = "test1",
+                },
+                new LinkPerson
+                {
+                    Email = "email2@example.com",
+                    Name = "test2",
+                },
+                new LinkPerson
+                {
+                    Email = "email3@example.com",
+                    Name = "test3",
+                },
+            };
+
+            var test = new QueryBuilder<LinkPerson>()
+                .For(set, x => 
+                    QueryBuilder.Insert(x, false)
+                ).Build().Prettify();
+
             // Selecting a type with autogen shape
             var query = QueryBuilder.Select<LinkPerson>().Build().Prettify();
 

src/EdgeDB.Net.QueryBuilder/EdgeDB.Net.QueryBuilder.csproj

@@ -31,6 +31,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EdgeDB.Net.Driver\EdgeDB.Net.Driver.csproj" />
   </ItemGroup>

src/EdgeDB.Net.QueryBuilder/Extensions/QueryBuilderExtensions.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EdgeDB
+{
+    internal static class QueryBuilderExtensions
+    {
+        public static BuiltQuery BuildWithoutAutogeneratedNodes(this IQueryBuilder builder, NodeBuilder nodeBuilder)
+        {
+            // remove addon & autogen nodes.
+            var userNodes = builder.Nodes.Where(x => !builder.Nodes.Any(y => y.SubNodes.Contains(x)) || !x.IsAutoGenerated);
+
+            // TODO: better checks for this, future should add a callback to add the
+            // node with its context so any parent builder can change contexts for nodes
+            foreach (var node in userNodes)
+                node.Context.SetAsGlobal = false;
+
+            foreach (var variable in builder.Variables)
+            {
+                nodeBuilder.QueryVariables[variable.Key] = variable.Value;
+            }
+
+            var newBuilder = new QueryBuilder<object?>(userNodes.ToList(), builder.Globals.ToList(), builder.Variables.ToDictionary(x => x.Key, x => x.Value));
+
+            return newBuilder.BuildWithGlobals();
+        } 
+    }
+}

src/EdgeDB.Net.QueryBuilder/JsonVariable.cs

@@ -0,0 +1,53 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EdgeDB
+{
+    internal interface IJsonVariable
+    {
+        string Name { get; }
+
+        Type InnerType { get; }
+
+        bool HasProperty(string name);
+    }
+
+    public class JsonVariable<T> : IJsonVariable
+    {
+        public string Name { get; }
+
+        public T Value
+            => throw new InvalidOperationException("Value cannot be accessed outside of an expression.");
+
+        internal bool IsObject
+            => _jToken is JObject;
+
+        private readonly JToken _jToken;
+
+        public JsonVariable(string name, JArray arr)
+        {
+            Name = name;
+            // get first element or empty jobject
+            if (arr.Count > 0)
+                _jToken = arr[0];
+            else
+                _jToken = new JObject();
+        }
+
+        internal bool HasProperty(string name)
+        {
+            if (_jToken is not JObject obj)
+                return false;
+
+            return obj.Property(name) is not null;
+        }
+
+        string IJsonVariable.Name => Name;
+        Type IJsonVariable.InnerType => typeof(T);
+        bool IJsonVariable.HasProperty(string name) => HasProperty(name);
+    }
+}

src/EdgeDB.Net.QueryBuilder/QueryBuilder.cs

@@ -178,6 +178,29 @@ internal BuiltQuery BuildWithGlobals()
             => InternalBuild(false);
 
         #region Root nodes
+        public QueryBuilder<TType> For(IEnumerable<TType> set, Expression<Func<JsonVariable<TType>, object?>> iterator)
+        {
+            AddNode<ForNode>(new ForContext(typeof(TType))
+            {
+                Expression = iterator,
+                Set = set
+            });
+
+            return this;
+        }
+
+        // for the simplified expression return type check
+        public QueryBuilder<TType> For(IEnumerable<TType> set, Expression<Func<JsonVariable<TType>, IQueryBuilder>> iterator)
+        {
+            AddNode<ForNode>(new ForContext(typeof(TType))
+            {
+                Expression = iterator,
+                Set = set
+            });
+
+            return this;
+        }
+
         /// <inheritdoc cref="IQueryBuilder{TType}.With(string, object?)"/>
         public QueryBuilder<TType> With(string name, object? value)
         {

src/EdgeDB.Net.QueryBuilder/QueryNodes/Contexts/ForContext.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EdgeDB.QueryNodes
+{
+    internal class ForContext : NodeContext
+    {
+        public LambdaExpression? Expression { get; init; }
+        public IEnumerable? Set { get; init; }
+
+        public ForContext(Type currentType) : base(currentType)
+        {
+        }
+    }
+}

src/EdgeDB.Net.QueryBuilder/QueryNodes/ForNode.cs

@@ -0,0 +1,56 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EdgeDB.QueryNodes
+{
+    internal class ForNode : QueryNode<ForContext>
+    {
+        public ForNode(NodeBuilder builder) : base(builder)
+        {
+        }
+
+        private string ParseExpression(string name, string json)
+        {
+            // check if we're returning a query builder
+            if (Context.Expression!.ReturnType == typeof(IQueryBuilder))
+            {
+                // construct the lambda and call it
+                var jArray = JArray.Parse(json);
+
+                var parameters = Context.Expression.Parameters.Select(x =>
+                {
+                    return x switch
+                    {
+                        _ when x.Type == typeof(QueryContext) => new QueryContext(),
+                        _ when ReflectionUtils.IsInstanceOfGenericType(typeof(JsonVariable<>), x.Type)
+                            => Activator.CreateInstance(typeof(JsonVariable<>).MakeGenericType(Context.CurrentType), name, jArray),
+                        _ => throw new ArgumentException($"Cannot use {x.Type} as a parameter to a for expression")
+                    };
+                }).ToArray();
+
+                var builder = (IQueryBuilder)Context.Expression!.Compile().DynamicInvoke(parameters)!;
+
+                return builder.BuildWithoutAutogeneratedNodes(Builder).Query;
+            }
+            else
+                return ExpressionTranslator.Translate(Context.Expression!, Builder.QueryVariables, Context, Builder.QueryGlobals);
+        }
+
+        public override void Visit()
+        {
+            var name = Context.Expression!.Parameters.First(x => x.Type != typeof(QueryContext)).Name!;
+
+            var setJson = JsonConvert.SerializeObject(Context.Set);
+            var jsonName = QueryUtils.GenerateRandomVariableName();
+            
+            SetVariable(jsonName, setJson);
+            
+            Query.Append($"for {name} in <json>${jsonName} union ({ParseExpression(name, setJson)})");
+        }
+    }
+}

src/EdgeDB.Net.QueryBuilder/QueryNodes/InsertNode.cs

@@ -1,6 +1,7 @@
 using EdgeDB.Serializer;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -22,13 +23,24 @@ private string BuildInsertLambdaShape(LambdaExpression expression)
         {
             return $"{{ {ExpressionTranslator.Translate(expression, Builder.QueryVariables, Context, Builder.QueryGlobals)} }}";
         }
-        
-        private string BuildInsertShape(Type? shapeType = null, object? shapeValue = null)
+
+        private string GetPropertyValue(object? inst, string? path, string type, PropertyInfo info)
+        {
+            if (inst is IJsonVariable json && json.HasProperty(info.Name))
+                return $"<{type}>{json.Name}{path}['{info.Name}']";
+            
+            var varName = QueryUtils.GenerateRandomVariableName();
+            SetVariable(varName, info.GetValue(inst));
+            return $"<{type}>${varName}";
+        }
+
+        private List<Type> _subInserts = new();
+        private string BuildInsertShape(Type? shapeType = null, object? shapeValue = null, string? path = null)
         {
             List<string> shape = new();
 
-            var type = shapeType ?? Context.CurrentType;
             var value = shapeValue ?? Context.Value;
+            var type = shapeType ?? (value is IJsonVariable var ? var.InnerType : Context.CurrentType);
 
             if (value is LambdaExpression expression)
                 return BuildInsertLambdaShape(expression);
@@ -43,45 +55,50 @@ private string BuildInsertShape(Type? shapeType = null, object? shapeValue = nul
 
                 if(edgeqlType != null)
                 {
-                    var varName = QueryUtils.GenerateRandomVariableName();
-                    SetVariable(varName, property.GetValue(Context.Value));
-                    shape.Add($"{propertyName} := <{edgeqlType}>${varName}");
+                    shape.Add(GetPropertyValue(value, path, edgeqlType, property));
                     continue;
                 }
 
-                // TODO: sub queries!
                 // might be a link?
                 if (TypeBuilder.IsValidObjectType(property.PropertyType))
                 {
-                    // is it a object we've seen before?
-                    var subValue = property.GetValue(value);
-                    if(QueryObjectManager.TryGetObjectId(subValue, out var id))
+                    if(value is IJsonVariable jsonVariable)
                     {
-                        // insert a sub query
-                        var globalName = GetOrAddGlobal(subValue, new SubQuery($"(select {property.PropertyType.GetEdgeDBTypeName()} filter .id = <uuid>\"{id}\")"));
-                        shape.Add($"{propertyName} := {globalName}");
-                        continue;
+                        if (_subInserts.Any(x => jsonVariable.InnerType == x))
+                            throw new InvalidOperationException("cannot preform sub type inserts of the same type within a json imported union");
                     }
                     else
                     {
-                        if (subValue is null)
-                            shape.Add($"{propertyName} := {{}}");
+                        // is it a object we've seen before?
+                        var subValue = property.GetValue(value);
+                        if (QueryObjectManager.TryGetObjectId(subValue, out var id))
+                        {
+                            // insert a sub query
+                            var globalName = GetOrAddGlobal(subValue, new SubQuery($"(select {property.PropertyType.GetEdgeDBTypeName()} filter .id = <uuid>\"{id}\")"));
+                            shape.Add($"{propertyName} := {globalName}");
+                            continue;
+                        }
                         else
                         {
-                            RequiresIntrospection = true;
-                            var globalName = GetOrAddGlobal(subValue, new SubQuery((info) =>
+                            if (subValue is null)
+                                shape.Add($"{propertyName} := {{}}");
+                            else
                             {
-                                var name = property.PropertyType.GetEdgeDBTypeName();
-                                var exclusiveProps = QueryUtils.GetProperties(info, property.PropertyType, true);
-                                var exclusiveCondition = exclusiveProps.Any() ?
-                                    $" unless conflict on {(exclusiveProps.Count() > 1 ? $"({string.Join(", ", exclusiveProps.Select(x => $".{x.GetEdgeDBPropertyName()}"))})" : $".{exclusiveProps.First().GetEdgeDBPropertyName()}")} else (select {name})"
-                                    : string.Empty;
-                                return $"(insert {name} {BuildInsertShape(property.PropertyType, subValue)}{exclusiveCondition})";
-                            }));
-                            shape.Add($"{propertyName} := {globalName}");
+                                RequiresIntrospection = true;
+                                var globalName = GetOrAddGlobal(subValue, new SubQuery((info) =>
+                                {
+                                    var name = property.PropertyType.GetEdgeDBTypeName();
+                                    var exclusiveProps = QueryUtils.GetProperties(info, property.PropertyType, true);
+                                    var exclusiveCondition = exclusiveProps.Any() ?
+                                        $" unless conflict on {(exclusiveProps.Count() > 1 ? $"({string.Join(", ", exclusiveProps.Select(x => $".{x.GetEdgeDBPropertyName()}"))})" : $".{exclusiveProps.First().GetEdgeDBPropertyName()}")} else (select {name})"
+                                        : string.Empty;
+                                    return $"(insert {name} {BuildInsertShape(property.PropertyType, subValue, path is null ? property.Name : path += $".{property.Name}")}{exclusiveCondition})";
+                                }));
+                                shape.Add($"{propertyName} := {globalName}");
+                            }
+
+                            continue;
                         }
-                        
-                        continue;
                     }
                 }
 
@@ -146,22 +163,7 @@ public void ElseDefault()
 
         public void Else(IQueryBuilder builder)
         {
-            // remove addon & autogen nodes.
-            var userNodes = builder.Nodes.Where(x => !builder.Nodes.Any(y => y.SubNodes.Contains(x)) || !x.IsAutoGenerated);
-
-            // TODO: better checks for this, future should add a callback to add the
-            // node with its context so any parent builder can change contexts for nodes
-            foreach (var node in userNodes)
-                node.Context.SetAsGlobal = false;
-
-            foreach(var variable in builder.Variables)
-            {
-                Builder.QueryVariables[variable.Key] = variable.Value;
-            }
-
-            var newBuilder = new QueryBuilder<object?>(userNodes.ToList(), builder.Globals.ToList(), builder.Variables.ToDictionary(x => x.Key, x=> x.Value));
-
-            var result = newBuilder.BuildWithGlobals();
+            var result = builder.BuildWithoutAutogeneratedNodes(Builder);
             _children.Append($" else ({result.Query})");
         }
     }