feat: set improvements

geldata · Sep 29, 2023 · f43bba2 · f43bba2
1 parent 9d1f7da
commit f43bba2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/lib/edgedb/edgeql/generator.ex b/lib/edgedb/edgeql/generator.ex
@@ -175,8 +175,8 @@ defmodule EdgeDB.EdgeQL.Generator do
     {args, positional?} = input_codec_to_args(input_codec, query.codec_storage)
     raw_shape = output_codec_to_shape(query, output_codec, query.codec_storage)
     raw_schema = shape_to_schema(raw_shape)
-    complex = complex_shape?(raw_shape)
-    final_list = query.result_cardinality in [:many, :at_least_one]
+    complex? = complex_shape?(raw_shape)
+    final_list? = query.result_cardinality in [:many, :at_least_one]
     types = types()
 
     rendered_shape =
@@ -207,10 +207,10 @@ defmodule EdgeDB.EdgeQL.Generator do
         types: types,
         shape: rendered_shape,
         schema: rendered_schema,
-        should_render_type_for_shape: rendered_schema && complex,
+        should_render_type_for_shape: rendered_schema && complex?,
         cardinality_to_function: @cardinality_to_function,
         result_type:
-          (complex && final_list && "list(Result.t())") || (complex && "Result.t()") ||
+          (complex? && final_list? && "list(Result.t())") || (complex? && "Result.t()") ||
             rendered_shape,
         query: %{
           statement: query.statement,
@@ -304,7 +304,7 @@ defmodule EdgeDB.EdgeQL.Generator do
               is_optional: optional?,
               is_link_property: link_property?,
               index: index,
-              registered: false
+              is_registered: false
             },
             codec_to_shape(codec, codec_storage)
           )
@@ -326,14 +326,14 @@ defmodule EdgeDB.EdgeQL.Generator do
     typename = "uuid()"
     uuid_typespec = @builtin_scalars_to_typespecs[Codecs.UUID]
     register_typespec(typename, uuid_typespec)
-    %{type: :builtin, typespec: typename, registered: true}
+    %{type: :builtin, typespec: typename, is_registered: true}
   end
 
   defp codec_to_shape(%Codecs.JSON{}, _codec_storage) do
     typename = "json()"
     json_typespec = @builtin_scalars_to_typespecs[Codecs.JSON]
     register_typespec(typename, json_typespec)
-    %{type: :builtin, typespec: typename, registered: true}
+    %{type: :builtin, typespec: typename, is_registered: true}
   end
 
   defp codec_to_shape(%Codecs.Duration{}, _codec_storage) do
@@ -351,14 +351,14 @@ defmodule EdgeDB.EdgeQL.Generator do
         register_typespec(typename, duration_typespec)
     end
 
-    %{type: :builtin, typespec: typename, registered: true}
+    %{type: :builtin, typespec: typename, is_registered: true}
   end
 
   defp codec_to_shape(%Codecs.Vector{}, _codec_storage) do
     typename = "vector()"
     vector_typespec = @builtin_scalars_to_typespecs[Codecs.Vector]
     register_typespec(typename, vector_typespec)
-    %{type: :builtin, typespec: typename, registered: true}
+    %{type: :builtin, typespec: typename, is_registered: true}
   end
 
   defp codec_to_shape(%codec_name{}, _codec_storage) when codec_name in @scalar_codecs do
@@ -380,14 +380,14 @@ defmodule EdgeDB.EdgeQL.Generator do
 
     register_typespec(full_type_name, {typedoc, subcodec_typespec})
 
-    %{type: :builtin, typespec: full_type_name, registered: true}
+    %{type: :builtin, typespec: full_type_name, is_registered: true}
   end
 
   defp codec_to_shape(%Codecs.Enum{name: type_name, members: members}, _codec_storage) do
     full_type_name = full_name_to_typespec(type_name)
     typedoc = "scalar type #{type_name} extending enum<#{Enum.join(members, ", ")}>"
     register_typespec(full_type_name, {typedoc, ["String.t()" | Enum.map(members, &":#{&1}")]})
-    %{type: :builtin, typespec: full_type_name, registered: true}
+    %{type: :builtin, typespec: full_type_name, is_registered: true}
   end
 
   defp codec_to_shape(%Codecs.Array{codec: subcodec}, codec_storage) do

diff --git a/priv/codegen/templates/_builtin.eex b/priv/codegen/templates/_builtin.eex
@@ -1,5 +1,5 @@
 <%= if @builtin[:is_list] do %>list(<% end %>
-<%= if @builtin[:registered] do %><%= @module_name %>.<% end %><%= @builtin.typespec %>
+<%= if @builtin[:is_registered] do %><%= @module_name %>.<% end %><%= @builtin.typespec %>
 <%= if @builtin[:is_list] do %>)<% end %>
 <%= if @builtin[:is_optional] do %>
 | nil

diff --git a/priv/codegen/templates/_object.eex b/priv/codegen/templates/_object.eex
@@ -13,6 +13,7 @@
             end;
         <% %{type: :set} -> %>
             defmodule <%= Macro.camelize(name) %> do
+                <%= if field.shape[:type] == :builtin do %>@type t() ::<% end %>
                 <%= @render_set.(
                     set: field,
                     render_shape: @render_shape,

diff --git a/priv/codegen/templates/_schema.eex b/priv/codegen/templates/_schema.eex
@@ -8,7 +8,7 @@
           paths: @paths ++ [name]) 
         %>,
       <% {name, schema} -> %>
-        <%= name %>: %Result.<%= Macro.camelize(name) %><%= @render_schema.(
+        <%= name %>: %Result.<%= Enum.map_join(@paths ++ [name],".", &(Macro.camelize(&1))) %><%= @render_schema.(
           schema: schema, 
           render_schema: @render_schema, 
           paths: @paths ++ [name])