more changes to inner generation

dbschema/migrations/00001.edgeql

@@ -1,6 +1,7 @@
-CREATE MIGRATION m1onahwoyqgtvzlz6g2wmvst4okehoog33xcxiqqv7oaghovjtdzpq
+CREATE MIGRATION m1cpt5buyevyky24nrcoyjzfl67idj3uculwgo47zpxjnkb442knjq
     ONTO initial
 {
+  CREATE MODULE tests IF NOT EXISTS;
   CREATE GLOBAL default::abc -> tuple<std::str, std::int64>;
   CREATE GLOBAL default::current_user_id -> std::uuid;
   CREATE ABSTRACT TYPE default::AbstractThing {
@@ -45,4 +46,37 @@ CREATE MIGRATION m1onahwoyqgtvzlz6g2wmvst4okehoog33xcxiqqv7oaghovjtdzpq
       };
       CREATE REQUIRED PROPERTY username: std::str;
   };
+  CREATE TYPE tests::Person {
+      CREATE LINK best_friend: tests::Person;
+      CREATE MULTI LINK friends: tests::Person;
+      CREATE PROPERTY age: std::int32;
+      CREATE PROPERTY email: std::str;
+      CREATE PROPERTY name: std::str;
+  };
+  CREATE TYPE tests::Club {
+      CREATE MULTI LINK admins: tests::Person;
+      CREATE MULTI LINK members: tests::Person;
+      CREATE PROPERTY name: std::str;
+  };
+  CREATE TYPE tests::ScalarContainer {
+      CREATE PROPERTY a: std::int16;
+      CREATE PROPERTY b: std::int32;
+      CREATE PROPERTY c: std::int64;
+      CREATE PROPERTY d: std::str;
+      CREATE PROPERTY e: std::bool;
+      CREATE PROPERTY f: std::float32;
+      CREATE PROPERTY g: std::float64;
+      CREATE PROPERTY h: std::bigint;
+      CREATE PROPERTY i: std::decimal;
+      CREATE PROPERTY j: std::uuid;
+      CREATE PROPERTY k: std::json;
+      CREATE PROPERTY l: std::datetime;
+      CREATE PROPERTY m: cal::local_datetime;
+      CREATE PROPERTY n: cal::local_date;
+      CREATE PROPERTY o: cal::local_time;
+      CREATE PROPERTY p: std::duration;
+      CREATE PROPERTY q: cal::relative_duration;
+      CREATE PROPERTY r: cal::date_duration;
+      CREATE PROPERTY s: std::bytes;
+  };
 };

dbschema/tests.esdl

@@ -20,4 +20,18 @@ module tests {
     r: cal::date_duration;
     s: bytes;
   }
+
+  type Person {
+    name: str;
+    age: int32;
+    email: str;
+    best_friend: Person;
+    multi friends: Person;
+  }
+
+  type Club {
+    name: str;
+    multi members: Person;
+    multi admins: Person;
+  }
 }

examples/EdgeDB.Examples.CSharp/Examples/QueryBuilder.cs

@@ -32,35 +32,6 @@ public async Task ExecuteAsync(EdgeDBClient client)
         {
             try
             {
-                var tests = await QueryBuilder
-                    .Select<ObjectType>(shape =>
-                    {
-                        shape.IncludeMultiLink(x => x.Constraints);
-                        shape.IncludeMultiLink(x => x.Properties, shape =>
-                            shape.Computeds((ctx, prop) => new
-                            {
-                                Cardinality = (string)ctx.UnsafeLocal<object>("cardinality") == "One"
-                                    ? ctx.UnsafeLocal<bool>("required")
-                                        ? Cardinality.One
-                                        : Cardinality.AtMostOne
-                                    : ctx.UnsafeLocal<bool>("required")
-                                        ? Cardinality.AtLeastOne
-                                        : Cardinality.Many,
-                                TargetId = ctx.UnsafeLocal<Guid>("target.id"),
-                                IsLink = ctx.Raw<object?>("[IS schema::Link]") != null,
-                                IsExclusive =
-                                    ctx.Raw<bool>("exists (select .constraints filter .name = 'std::exclusive')"),
-                                IsComputed = EdgeQL.Len(ctx.UnsafeLocal<object[]>("computed_fields")) != 0,
-                                IsReadonly = ctx.UnsafeLocal<bool>("readonly"),
-                                HasDefault =
-                                    ctx.Raw<bool>(
-                                        "EXISTS .default or (\"std::sequence\" in .target[IS schema::ScalarType].ancestors.name)")
-                            })
-                        );
-                    })
-                    .Filter((x, ctx) => !ctx.UnsafeLocal<bool>("builtin"))
-                    .CompileAsync(client, true);
-
                 await QueryBuilderDemo(client);
             }
             catch (Exception x)
@@ -72,10 +43,10 @@ public async Task ExecuteAsync(EdgeDBClient client)
         private static async Task QueryBuilderDemo(EdgeDBClient client)
         {
             // Selecting a type with autogen shape
-            var query = QueryBuilder.Select<Person>().Compile().Prettify();
+            var query = QueryBuilder.Select<Person>().Compile(true);
 
             // Adding a filter, orderby, offset, and limit
-            var queryTest = QueryBuilder
+            query = QueryBuilder
                 .Select<Person>()
                 .Filter(x => EdgeQL.ILike(x.Name, "e%"))
                 .OrderByDesending(x => x.Name)
@@ -87,12 +58,12 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
             query = QueryBuilder.Select<Person>(shape =>
                 shape
                     .Explicitly(p => new { p.Name, p.Email, p.BestFriend })
-            ).Compile().Prettify();
+            ).Compile(true);
 
             // selecting things that are not types
             query = QueryBuilder.SelectExpression(() =>
                 EdgeQL.Count(QueryBuilder.Select<Person>())
-            ).Compile().Prettify();
+            ).Compile(true);
 
             // selecting 'free objects'
             query = QueryBuilder.SelectExpression(ctx => new
@@ -101,7 +72,7 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                 MyNumber = 42,
                 SeveralNumbers = new long[] { 1, 2, 3 },
                 People = ctx.SubQuery(QueryBuilder.Select<Person>())
-            }).Compile().Prettify();
+            }).Compile(true);
 
             // Backlinks
             query = QueryBuilder.Select<Person>(shape => shape
@@ -113,43 +84,41 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                     // you can pass in a string instead of an expression to select out a 'EdgeDBObject' type.
                     ReferencedFriends = ctx.BackLink<Person>(x => x.Friends)
                 })
-            ).Compile().Prettify();
+            ).Compile(true);
 
             // With object variables
             query = QueryBuilder
                 .With(new { Args = EdgeQL.AsJson(new { Name = "Example", Email = "[email protected]" }) })
                 .SelectExpression(ctx => new
                 {
                     PassedName = ctx.Variables.Args.Value.Name, PassedEmail = ctx.Variables.Args.Value.Email
-                }).Compile().Prettify();
+                }).Compile(true);
 
             // Inserting a new type
             var person = new Person { Email = "[email protected]", Name = "example" };
 
-            query = QueryBuilder.Insert(person).Compile().Prettify();
+            query = QueryBuilder.Insert(person).Compile(true);
 
             // Complex insert with links & dealing with conflicts
-            query = (await QueryBuilder
-                    .Insert(new Person { BestFriend = person, Name = "example2", Email = "[email protected]" })
-                    .UnlessConflict()
-                    .ElseReturn()
-                    .CompileAsync(client))
-                .Prettify();
+            query = await QueryBuilder
+                .Insert(new Person {BestFriend = person, Name = "example2", Email = "[email protected]"})
+                .UnlessConflict()
+                .ElseReturn()
+                .CompileAsync(client, true);
 
             // Manual conflicts
             query = QueryBuilder
                 .Insert(person)
                 .UnlessConflictOn(x => x.Email)
                 .ElseReturn()
-                .Compile()
-                .Prettify();
+                .Compile(true);
 
             // Autogenerating unless conflict with introspection
-            queryTest = (await QueryBuilder
-                    .Insert(person)
-                    .UnlessConflict()
-                    .ElseReturn()
-                    .CompileAsync(client, true));
+            query = await QueryBuilder
+                .Insert(person)
+                .UnlessConflict()
+                .ElseReturn()
+                .CompileAsync(client, true);
 
             // Bulk inserts
             var data = new Person[]
@@ -163,33 +132,30 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                 }
             };
 
-            var tquery = await QueryBuilder.For(data,
+            query = await QueryBuilder.For(data,
                 x => QueryBuilder.Insert(x)
-            ).CompileAsync(client);
+            ).CompileAsync(client, true);
 
             // Else statements (upsert demo)
-            query = (await QueryBuilder
-                    .Insert(person)
-                    .UnlessConflict()
-                    .Else(q =>
-                        q.Update(old => new Person { Name = old!.Name!.ToLower() })
-                    )
-                    .CompileAsync(client))
-                .Prettify();
+            query = await QueryBuilder
+                .Insert(person)
+                .UnlessConflict()
+                .Else(q =>
+                    q.Update(old => new Person {Name = old!.Name!.ToLower()})
+                )
+                .CompileAsync(client, true);
 
             // Updating a type
             query = QueryBuilder
                 .Update<Person>(old => new Person { Name = "example new name" })
                 .Filter(x => x.Email == "[email protected]")
-                .Compile()
-                .Prettify();
+                .Compile(true);
 
             // Deleting types
             query = QueryBuilder
                 .Delete<Person>()
                 .Filter(x => EdgeQL.ILike(x.Name, "e%"))
-                .Compile()
-                .Prettify();
+                .Compile(true);
         }
     }
 }

src/EdgeDB.Net.QueryBuilder/Grammar/Reducers/ShapeReducer.cs

@@ -14,7 +14,7 @@ public void Reduce(IQueryBuilder builder, QueryWriter writer)
                 continue;
 
             Value[]? tokens = null;
-            foreach (var marker in markers)
+            foreach (var marker in markers.ToArray())
             {
                 Action<QueryNode>? modifier = marker switch
                 {

src/EdgeDB.Net.QueryBuilder/Grammar/Terms.cs

@@ -101,6 +101,14 @@ public static QueryWriter Assignment(this QueryWriter writer, Value name, Value
     public static QueryWriter TypeCast(this QueryWriter writer, Value type)
         => writer.Append("<", type, ">");
 
+    public static QueryWriter Variable(this QueryWriter writer, Value type, Value name)
+        => writer.Marker(
+            MarkerType.Variable,
+            $"variable_{name}",
+            debug: null,
+            Value.Of(writer => writer.TypeCast(type).Append(name))
+        );
+
     public readonly struct FunctionArg
     {
         public readonly Value Value;

src/EdgeDB.Net.QueryBuilder/Lexical/MarkerType.cs

@@ -2,7 +2,8 @@
 
 public enum MarkerType
 {
-    Global,
+    GlobalReference,
+    GlobalDeclaration,
     Function,
     FunctionArg,
     Shape,

src/EdgeDB.Net.QueryBuilder/Lexical/Value.cs

@@ -90,6 +90,18 @@ private string DebugDisplay()
         return _ch is not null ? $"char \'{_ch}\'" : _value is null ? "null" : $"value {_value}";
     }
 
+    public override string ToString()
+    {
+        if (_callback is not null)
+            return "<callback>";
+        if (_str is not null)
+            return "<str>";
+        if (_ch.HasValue)
+            return "<char>";
+
+        return "<object>";
+    }
+
     public static implicit operator Value(string? value) => new(value);
     public static implicit operator Value(char value) => new(value);
     public static implicit operator Value(WriterProxy callback) => new(callback);

src/EdgeDB.Net.QueryBuilder/QueryGlobal.cs

@@ -74,21 +74,33 @@ public Value[] Compile(QueryNode source, QueryWriter writer, CompileContext? con
         private Value[] Compile<T>(T source, Action<IQueryBuilder, QueryWriter, T, CompileContext?> compileBuilder, QueryWriter writer, CompileContext? context = null,
             SchemaInfo? info = null)
         {
-            return Value switch
-            {
-                // if its a query builder, build it and add it as a sub-query.
-                IQueryBuilder queryBuilder => writer
-                    .Span(writer =>
-                        writer.Wrapped(
-                            writer => compileBuilder(queryBuilder, writer, source, context)
-                        )
-                    ),
-                // if its a sub query that requires introspection, build it and add it.
-                SubQuery {RequiresIntrospection: true} when info is null => throw new InvalidOperationException(
-                    "Cannot build without introspection! A node requires query introspection."),
-                SubQuery {RequiresIntrospection: true} subQuery => writer.Span(writer => subQuery.Build(info, writer)),
-                _ => writer.Span(writer => QueryUtils.ParseObject(writer, Value))
-            };
+            return writer.Span(writer => writer
+                .Marker(
+                    MarkerType.GlobalDeclaration,
+                    Name,
+                    Defer.This(() => $"Reference?: {Reference?.GetType().ToString() ?? "null"}, Value?: {Value?.GetType().ToString() ?? "null"}"),
+                    EdgeDB.Value.Of(writer =>
+                    {
+                        switch (Value)
+                        {
+                            case IQueryBuilder queryBuilder:
+                                writer.Wrapped(writer =>
+                                    compileBuilder(queryBuilder, writer, source, context));
+                                break;
+                            case SubQuery {RequiresIntrospection: true} when info is null:
+                                throw new
+                                    InvalidOperationException(
+                                        "Cannot build without introspection! A node requires query introspection.");
+                            case SubQuery {RequiresIntrospection: true} subQuery:
+                                subQuery.Build(info, writer);
+                                break;
+                            default:
+                                QueryUtils.ParseObject(writer, Value);
+                                break;
+                        }
+                    })
+
+            ));
         }
     }
 }

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

@@ -114,8 +114,17 @@ public override void FinalizeQuery(QueryWriter writer)
             if (_name is null || _jsonName is null || _expression is null)
                 throw new InvalidOperationException("No initialization of this node was preformed");
 
-            // append the 'FOR' statement
-            writer.Append("for ", _name, " in json_array_unpack(<json>", _jsonName, ") union ", Value.Of(writer => writer.Wrapped(_expression)));
+            writer.Append(
+                "for ",
+                _name,
+                " in ",
+                Value.Of(writer => writer.Function(
+                    "json_array_unpack",
+                    Value.Of(writer => writer.Variable("json", _jsonName))
+                )),
+                " union ",
+                Value.Of(writer => writer.Wrapped(_expression))
+            );
         }
     }
 }