EdgeQL to Elixir generation

.credo.exs

@@ -31,7 +31,13 @@
           "apps/*/test/",
           "apps/*/web/"
         ],
-        excluded: [~r"/_build/", ~r"/deps/", ~r"/node_modules/"]
+        excluded: [
+          ~r"/_build/",
+          ~r"/deps/",
+          ~r"/node_modules/",
+          ~r"/test/codegen/queries/",
+          ~r"/test/support/scripts/"
+        ]
       },
       #
       # Load and configure plugins here:
@@ -131,7 +137,7 @@
         {Credo.Check.Refactor.MatchInCondition, []},
         {Credo.Check.Refactor.NegatedConditionsInUnless, []},
         {Credo.Check.Refactor.NegatedConditionsWithElse, []},
-        {Credo.Check.Refactor.Nesting, []},
+        {Credo.Check.Refactor.Nesting, [max_nesting: 3]},
         {Credo.Check.Refactor.UnlessWithElse, []},
         {Credo.Check.Refactor.WithClauses, []},
 

.formatter.exs

@@ -1,4 +1,5 @@
 # Used by "mix format"
 [
+  line_length: 120,
   inputs: ["{mix,.formatter,.credo}.exs", "{config,lib,test}/**/*.{ex,exs}"]
 ]

.github/workflows/tests.yml

@@ -64,15 +64,16 @@ jobs:
         run: |
           EDGEDB_VERSION=${EDGEDB_VERSION%%.*}
 
-          rm -r "priv/edgedb/schema/migrations/"
+          rm -r "test/support/schema/migrations/"
 
-          for module_file in `ls priv/edgedb/schema/`
+          for module_file in `ls test/support/schema/`
           do
               module_version=${module_file%.esdl}
               module_version=${module_version#v}
+              module_version=${module_version%_*}
               if test ${EDGEDB_VERSION} -lt ${module_version}
               then
-                  module_path="priv/edgedb/schema/${module_file}"
+                  module_path="test/support/schema/${module_file}"
                   echo "removing ${module_path}"
                   rm ${module_path}
               fi

.gitignore

@@ -28,4 +28,4 @@ edgedb-*.tar
 # dialyzer
 priv/plts/
 
-examples/
+test/codegen/queries/

CHANGELOG.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [Compare with 0.7.0](https://github.com/edgedb/edgedb-elixir/compare/v0.7.0...HEAD)
 
+### Added
+
+- support for generating Elixir modules from EdgeQL queries via `mix edgedb.generate`.
+- abitility to pass atoms as valid arguments for enums.
+
+### Changed
+
+- `jason` to be required library, but still configurable.
+- `EdgeDB.NamedTuple.to_map/2` to include indexes as keys into result map.
+
 ## [0.7.0] - 2024-05-05
 
 [Compare with 0.6.1](https://github.com/edgedb/edgedb-elixir/compare/v0.6.1...v0.7.0)
@@ -30,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - the behavior of injecting an implicit `:id` field into objects so that this no longer happens.
 
 ### Fixed
+
 - client state handling in `EdgeDB.with_config/2`/`EdgeDB.without_config/2`,
     `EdgeDB.with_globals/2`/`EdgeDB.without_globals/2` and
     `EdgeDB.with_module_aliases/2`/`EdgeDB.without_module_aliases/2`.

config/config.exs

@@ -1,3 +1,11 @@
 import Config
 
 import_config("#{Mix.env()}.exs")
+
+config :edgedb,
+  generation: [
+    queries_path: "test/support/codegen/edgeql/",
+    output_path: "test/codegen/queries/",
+    module_prefix: Tests.Codegen.Queries,
+    atomize_enums: true
+  ]

edgedb.toml

@@ -1,5 +1,5 @@
 [edgedb]
-server-version = "5.2"
+server-version = "5.4"
 
 [project]
-schema-dir = "./priv/edgedb/schema"
+schema-dir = "./test/support/schema"

lib/edgedb.ex

@@ -178,6 +178,11 @@ defmodule EdgeDB do
   """
   @type result() :: EdgeDB.Set.t() | term()
 
+  @typedoc """
+  Parameter types acceptable by `EdgeDB.query*/4` functions.
+  """
+  @type params() :: map() | list() | Keyword.t()
+
   @doc """
   Creates a pool of EdgeDB connections linked to the current process.
 
@@ -308,7 +313,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query(client(), String.t(), list() | Keyword.t(), list(query_option())) ::
+  @spec query(client(), String.t(), params(), list(query_option())) ::
           {:ok, result()}
           | {:error, Exception.t()}
   def query(client, statement, params \\ [], opts \\ []) do
@@ -318,7 +323,8 @@ defmodule EdgeDB do
       output_format: Keyword.get(opts, :output_format, :binary),
       required: Keyword.get(opts, :required, false),
       is_script: Keyword.get(opts, :script, false),
-      params: params
+      params: params,
+      __file__: opts[:__file__]
     }
 
     parse_execute_query(client, q, q.params, opts)
@@ -333,7 +339,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query!(client(), String.t(), list(), list(query_option())) :: result()
+  @spec query!(client(), String.t(), params(), list(query_option())) :: result()
   def query!(client, statement, params \\ [], opts \\ []) do
     client
     |> query(statement, params, opts)
@@ -348,7 +354,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_single(client(), String.t(), list(), list(query_option())) ::
+  @spec query_single(client(), String.t(), params(), list(query_option())) ::
           {:ok, result()}
           | {:error, Exception.t()}
   def query_single(client, statement, params \\ [], opts \\ []) do
@@ -364,7 +370,8 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_single!(client(), String.t(), list(), list(query_option())) :: result()
+  @spec query_single!(client(), String.t(), params(), list(query_option())) ::
+          result()
   def query_single!(client, statement, params \\ [], opts \\ []) do
     client
     |> query_single(statement, params, opts)
@@ -379,7 +386,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_required_single(client(), String.t(), list(), list(query_option())) ::
+  @spec query_required_single(client(), String.t(), params(), list(query_option())) ::
           {:ok, result()}
           | {:error, Exception.t()}
   def query_required_single(client, statement, params \\ [], opts \\ []) do
@@ -395,7 +402,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_required_single!(client(), String.t(), list(), list(query_option())) :: result()
+  @spec query_required_single!(client(), String.t(), params(), list(query_option())) :: result()
   def query_required_single!(client, statement, params \\ [], opts \\ []) do
     client
     |> query_required_single(statement, params, opts)
@@ -410,7 +417,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_json(client(), String.t(), list(), list(query_option())) ::
+  @spec query_json(client(), String.t(), params(), list(query_option())) ::
           {:ok, result()}
           | {:error, Exception.t()}
   def query_json(client, statement, params \\ [], opts \\ []) do
@@ -426,7 +433,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_json!(client(), String.t(), list(), list(query_option())) :: result()
+  @spec query_json!(client(), String.t(), params(), list(query_option())) :: result()
   def query_json!(client, statement, params \\ [], opts \\ []) do
     client
     |> query_json(statement, params, opts)
@@ -441,7 +448,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_single_json(client(), String.t(), list(), list(query_option())) ::
+  @spec query_single_json(client(), String.t(), params(), list(query_option())) ::
           {:ok, result()}
           | {:error, Exception.t()}
   def query_single_json(client, statement, params \\ [], opts \\ []) do
@@ -457,7 +464,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_single_json!(client(), String.t(), list(), list(query_option())) :: result()
+  @spec query_single_json!(client(), String.t(), params(), list(query_option())) :: result()
   def query_single_json!(client, statement, params \\ [], opts \\ []) do
     client
     |> query_single_json(statement, params, opts)
@@ -472,7 +479,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_required_single_json(client(), String.t(), list(), list(query_option())) ::
+  @spec query_required_single_json(client(), String.t(), params(), list(query_option())) ::
           {:ok, result()}
           | {:error, Exception.t()}
   def query_required_single_json(client, statement, params \\ [], opts \\ []) do
@@ -488,7 +495,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec query_required_single_json!(client(), String.t(), list(), list(query_option())) ::
+  @spec query_required_single_json!(client(), String.t(), params(), list(query_option())) ::
           result()
   def query_required_single_json!(client, statement, params \\ [], opts \\ []) do
     client
@@ -501,7 +508,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec execute(client(), String.t(), list(), list(query_option())) ::
+  @spec execute(client(), String.t(), params(), list(query_option())) ::
           :ok | {:error, Exception.t()}
   def execute(client, statement, params \\ [], opts \\ []) do
     opts = Keyword.merge(opts, output_format: :none, script: true, raw: true)
@@ -522,7 +529,7 @@ defmodule EdgeDB do
 
   See `t:EdgeDB.query_option/0` for supported options.
   """
-  @spec execute!(client(), String.t(), list(), list(query_option())) :: :ok
+  @spec execute!(client(), String.t(), params(), list(query_option())) :: :ok
   def execute!(client, statement, params \\ [], opts \\ []) do
     opts = Keyword.merge(opts, output_format: :none, script: true, raw: true)
     query!(client, statement, params, opts)