feat: support nested ecto arrays

Author: efcasado

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java

@@ -302,12 +302,6 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
                 writer.write(text.toUpperCase(Locale.ROOT));
             }
         });
-        additionalProperties.put("toEctoType", new Mustache.Lambda() {
-            @Override
-            public void execute(Template.Fragment fragment, Writer writer) throws IOException {
-                writer.write(toEctoType(fragment.execute()));
-            }
-        });
 
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
             setModuleName((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
@@ -386,7 +380,34 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
     @Override
     public CodegenModel fromModel(String name, Schema model) {
         CodegenModel cm = super.fromModel(name, model);
-        return new ExtendedCodegenModel(cm);
+        ExtendedCodegenModel ecm = new ExtendedCodegenModel(cm);
+        
+        // Convert all CodegenProperty objects to ExtendedCodegenProperty
+        List<CodegenProperty> vars = new ArrayList<>(ecm.vars);
+        ecm.vars.clear();
+        for (CodegenProperty var : vars) {
+            ecm.vars.add(new ExtendedCodegenProperty(var));
+        }
+        
+        List<CodegenProperty> allVars = new ArrayList<>(ecm.allVars);
+        ecm.allVars.clear();
+        for (CodegenProperty var : allVars) {
+            ecm.allVars.add(new ExtendedCodegenProperty(var));
+        }
+        
+        List<CodegenProperty> requiredVars = new ArrayList<>(ecm.requiredVars);
+        ecm.requiredVars.clear();
+        for (CodegenProperty var : requiredVars) {
+            ecm.requiredVars.add(new ExtendedCodegenProperty(var));
+        }
+        
+        List<CodegenProperty> optionalVars = new ArrayList<>(ecm.optionalVars);
+        ecm.optionalVars.clear();
+        for (CodegenProperty var : optionalVars) {
+            ecm.optionalVars.add(new ExtendedCodegenProperty(var));
+        }
+        
+        return ecm;
     }
 
     @Override
@@ -441,35 +462,6 @@ private String atomized(String text) {
         return atom.toString();
     }
 
-    private String toEctoType(String baseType) {
-        switch (baseType) {
-            case "integer()":
-                return ":integer";
-            case "float()":
-                return ":float";
-            case "number()":
-                return ":float";
-            case "boolean()":
-                return ":boolean";
-            case "String.t":
-                return ":string";
-            case "Date.t":
-                return ":date";
-            case "DateTime.t":
-                return ":utc_datetime";
-            case "binary()":
-                return ":binary";
-            case "list()":
-                return "{:array, :any}";
-            case "map()":
-                return ":map";
-            case "nil":
-                return ":any, virtual: true";
-            default:
-                return ":any, virtual: true";
-        }
-    }
-
     /**
      * Escapes a reserved word as defined in the `reservedWords` array. Handle
      * escaping
@@ -967,6 +959,117 @@ public boolean hasComplexVars() {
         }
     }
 
+    class ExtendedCodegenProperty extends CodegenProperty {
+        public ExtendedCodegenProperty(CodegenProperty cp) {
+            super();
+
+            // Copy all fields of CodegenProperty
+            this.openApiType = cp.openApiType;
+            this.baseName = cp.baseName;
+            this.complexType = cp.complexType;
+            this.getter = cp.getter;
+            this.setter = cp.setter;
+            this.description = cp.description;
+            this.dataType = cp.dataType;
+            this.datatypeWithEnum = cp.datatypeWithEnum;
+            this.dataFormat = cp.dataFormat;
+            this.name = cp.name;
+            this.min = cp.min;
+            this.max = cp.max;
+            this.defaultValue = cp.defaultValue;
+            this.defaultValueWithParam = cp.defaultValueWithParam;
+            this.baseType = cp.baseType;
+            this.containerType = cp.containerType;
+            this.title = cp.title;
+            this.unescapedDescription = cp.unescapedDescription;
+            this.maxLength = cp.maxLength;
+            this.minLength = cp.minLength;
+            this.pattern = cp.pattern;
+            this.example = cp.example;
+            this.jsonSchema = cp.jsonSchema;
+            this.minimum = cp.minimum;
+            this.maximum = cp.maximum;
+            this.exclusiveMinimum = cp.exclusiveMinimum;
+            this.exclusiveMaximum = cp.exclusiveMaximum;
+            this.required = cp.required;
+            this.deprecated = cp.deprecated;
+            this.hasMoreNonReadOnly = cp.hasMoreNonReadOnly;
+            this.isPrimitiveType = cp.isPrimitiveType;
+            this.isModel = cp.isModel;
+            this.isContainer = cp.isContainer;
+            this.isString = cp.isString;
+            this.isNumeric = cp.isNumeric;
+            this.isInteger = cp.isInteger;
+            this.isLong = cp.isLong;
+            this.isNumber = cp.isNumber;
+            this.isFloat = cp.isFloat;
+            this.isDouble = cp.isDouble;
+            this.isByteArray = cp.isByteArray;
+            this.isBinary = cp.isBinary;
+            this.isFile = cp.isFile;
+            this.isBoolean = cp.isBoolean;
+            this.isDate = cp.isDate;
+            this.isDateTime = cp.isDateTime;
+            this.isUuid = cp.isUuid;
+            this.isEmail = cp.isEmail;
+            this.isModel = cp.isModel;
+            this.isNull = cp.isNull;
+            this.isArray = cp.isArray;
+            this.isMap = cp.isMap;
+            this.isEnum = cp.isEnum;
+            this.isReadOnly = cp.isReadOnly;
+            this.isWriteOnly = cp.isWriteOnly;
+            this.isNullable = cp.isNullable;
+            this._enum = cp._enum;
+            this.allowableValues = cp.allowableValues;
+            this.items = cp.items;
+            this.additionalProperties = cp.additionalProperties;
+            this.vars = cp.vars;
+            this.requiredVars = cp.requiredVars;
+            this.vendorExtensions = cp.vendorExtensions;
+        }
+
+        public String ectoType() {
+            String ectoType = ectoType(this);
+
+            if (":any".equals(ectoType)) {
+                return ectoType + ", virtual: true";
+            }
+
+            return ectoType;
+        }
+
+        private String ectoType(CodegenProperty property) {
+            String baseType = property.baseType;
+            switch (baseType) {
+                case "integer()":
+                    return ":integer";
+                case "float()":
+                    return ":float";
+                case "number()":
+                    return ":float";
+                case "boolean()":
+                    return ":boolean";
+                case "String.t":
+                    return ":string";
+                case "Date.t":
+                    return ":date";
+                case "DateTime.t":
+                    return ":utc_datetime";
+                case "binary()":
+                    return ":binary";
+                case "list()":
+                    return "{:array, " + ectoType(property.items) + "}";
+                case "map()":
+                    return ":map";
+                case "nil":
+                    return ":any";
+                default:
+                    return ":any";
+            }
+        }
+    }
+
     @Override
     public String escapeQuotationMark(String input) {
         return input.replace("\"", "");

modules/openapi-generator/src/main/resources/elixir/model.mustache

@@ -10,7 +10,7 @@
   typed_embedded_schema do
   {{#vars}}
     {{#isPrimitiveType}}
-    field {{#atom}}{{&baseName}}{{/atom}}, {{#toEctoType}}{{{baseType}}}{{/toEctoType}}{{#required}}, null: false{{/required}}
+    field {{#atom}}{{&baseName}}{{/atom}}, {{{ectoType}}}{{#required}}, null: false{{/required}}
     {{/isPrimitiveType}}
     {{^isPrimitiveType}}
     {{^isArray}}embeds_one{{/isArray}}{{#isArray}}embeds_many{{/isArray}} {{#atom}}{{&baseName}}{{/atom}}, {{&moduleName}}.Model.{{^isArray}}{{{baseType}}}{{/isArray}}{{#isArray}}{{{items.baseType}}}{{/isArray}}{{#isNullable}}, null: true{{/isNullable}}

samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_array_of_number_only.ex

@@ -10,7 +10,7 @@ defmodule OpenapiPetstore.Model.ArrayOfArrayOfNumberOnly do
   @derive {JSON.Encoder, only: [:ArrayArrayNumber]}
   @primary_key false
   typed_embedded_schema do
-    field :ArrayArrayNumber, {:array, :any}
+    field :ArrayArrayNumber, {:array, {:array, :float}}
   end
 
   @spec new(map()) :: t()

samples/client/petstore/elixir/lib/openapi_petstore/model/array_of_number_only.ex

@@ -10,7 +10,7 @@ defmodule OpenapiPetstore.Model.ArrayOfNumberOnly do
   @derive {JSON.Encoder, only: [:ArrayNumber]}
   @primary_key false
   typed_embedded_schema do
-    field :ArrayNumber, {:array, :any}
+    field :ArrayNumber, {:array, :float}
   end
 
   @spec new(map()) :: t()

samples/client/petstore/elixir/lib/openapi_petstore/model/array_test.ex

@@ -10,9 +10,9 @@ defmodule OpenapiPetstore.Model.ArrayTest do
   @derive {JSON.Encoder, only: [:array_of_string, :array_array_of_integer, :array_array_of_model]}
   @primary_key false
   typed_embedded_schema do
-    field :array_of_string, {:array, :any}
-    field :array_array_of_integer, {:array, :any}
-    field :array_array_of_model, {:array, :any}
+    field :array_of_string, {:array, :string}
+    field :array_array_of_integer, {:array, {:array, :integer}}
+    field :array_array_of_model, {:array, {:array, :any}}
   end
 
   @spec new(map()) :: t()

samples/client/petstore/elixir/lib/openapi_petstore/model/enum_arrays.ex

@@ -11,7 +11,7 @@ defmodule OpenapiPetstore.Model.EnumArrays do
   @primary_key false
   typed_embedded_schema do
     field :just_symbol, :string
-    field :array_enum, {:array, :any}
+    field :array_enum, {:array, :string}
   end
 
   @spec new(map()) :: t()

samples/client/petstore/elixir/lib/openapi_petstore/model/nullable_class.ex

@@ -16,9 +16,9 @@ defmodule OpenapiPetstore.Model.NullableClass do
     field :string_prop, :string
     field :date_prop, :date
     field :datetime_prop, :utc_datetime
-    field :array_nullable_prop, {:array, :any}
-    field :array_and_items_nullable_prop, {:array, :any}
-    field :array_items_nullable, {:array, :any}
+    field :array_nullable_prop, {:array, :map}
+    field :array_and_items_nullable_prop, {:array, :map}
+    field :array_items_nullable, {:array, :map}
     field :object_nullable_prop, :map
     field :object_and_items_nullable_prop, :map
     field :object_items_nullable, :map

samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex

@@ -13,7 +13,7 @@ defmodule OpenapiPetstore.Model.ObjectWithDeprecatedFields do
     field :uuid, :string
     field :id, :float
     embeds_one :deprecatedRef, OpenapiPetstore.Model.DeprecatedModel
-    field :bars, {:array, :any}
+    field :bars, {:array, :string}
   end
 
   @spec new(map()) :: t()